diff options
| author | Qingfang Deng <qingfang.deng@linux.dev> | 2026-08-04 17:43:34 +0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2026-08-05 18:34:20 -0700 |
| commit | eaebed6b2f50d8cf230af1b536a752e5bf512633 (patch) | |
| tree | 6565b791d829b30bc33cd056c735b18b5c356797 /drivers/net/ppp/pppoe.c | |
| parent | ff3a8694c2e8800272e020c97bd1a7d0fe89297e (diff) | |
| download | linux-next-eaebed6b2f50d8cf230af1b536a752e5bf512633.tar.gz linux-next-eaebed6b2f50d8cf230af1b536a752e5bf512633.zip | |
pppoe: remove redundant xmit wrapper
Merge __pppoe_xmit() into pppoe_xmit(), its only caller.
Signed-off-by: Qingfang Deng <qingfang.deng@linux.dev>
Link: https://patch.msgid.link/20260804094336.109364-1-qingfang.deng@linux.dev
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/ppp/pppoe.c')
| -rw-r--r-- | drivers/net/ppp/pppoe.c | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/drivers/net/ppp/pppoe.c b/drivers/net/ppp/pppoe.c index 6874a1a8edaf..bf7414b46a26 100644 --- a/drivers/net/ppp/pppoe.c +++ b/drivers/net/ppp/pppoe.c @@ -85,8 +85,6 @@ #define PPPOE_HASH_SIZE (1 << PPPOE_HASH_BITS) #define PPPOE_HASH_MASK (PPPOE_HASH_SIZE - 1) -static int __pppoe_xmit(struct sock *sk, struct sk_buff *skb); - static const struct proto_ops pppoe_ops; static const struct ppp_channel_ops pppoe_chan_ops; @@ -839,11 +837,13 @@ end: /************************************************************************ * - * xmit function for internal use. + * xmit function called by generic PPP driver + * sends PPP frame over PPPoE socket * ***********************************************************************/ -static int __pppoe_xmit(struct sock *sk, struct sk_buff *skb) +static int pppoe_xmit(struct ppp_channel *chan, struct sk_buff *skb) { + struct sock *sk = chan->private; struct pppox_sock *po = pppox_sk(sk); struct net_device *dev = po->pppoe_dev; struct pppoe_hdr *ph; @@ -893,18 +893,6 @@ abort: return 1; } -/************************************************************************ - * - * xmit function called by generic PPP driver - * sends PPP frame over PPPoE socket - * - ***********************************************************************/ -static int pppoe_xmit(struct ppp_channel *chan, struct sk_buff *skb) -{ - struct sock *sk = chan->private; - return __pppoe_xmit(sk, skb); -} - static int pppoe_fill_forward_path(struct net_device_path_ctx *ctx, struct net_device_path *path, const struct ppp_channel *chan) |