Skip to contentSkip to conversation

pppoe: remove redundant xmit wrapper

PATCH Applied Qingfang Deng 2 participants 2 messages Aug 4 – Aug 6

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 pppoe: remove redundant xmit wrapper

Merge __pppoe_xmit() into pppoe_xmit(), its only caller.

---
 drivers/net/ppp/pppoe.c | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)
drivers/net/ppp/pppoe.c +4 -16
index 6874a1a8edaf..bf7414b46a26 100644
@@ -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 @@ static int pppoe_sendmsg(struct socket *sock, struct msghdr *m,
 
 /************************************************************************
  *
- * 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 @@ static int __pppoe_xmit(struct sock *sk, struct sk_buff *skb)
 	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)
Signature · 1 line
2.43.0
#1 lore raw
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:

Hello:

This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:

Quoted 6 lines · On Tue, 4 Aug 2026 17:43:34 +0800 you wrote:

Merge __pppoe_xmit() into pppoe_xmit(), its only caller.

---
 drivers/net/ppp/pppoe.c | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

Here is the summary with links:
- [net-next] pppoe: remove redundant xmit wrapper

    https://git.kernel.org/netdev/net-next/c/eaebed6b2f50

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html