[PATCH 5.4 010/154] netpoll: remove dev argument from netpoll_send_skb_on_dev()

Greg Kroah-Hartman
2025-04-08T12:02:38Z

From: Eric Dumazet <edumazet@google.com>

[ Upstream commit 307f660d056b5eb8f5bb2328fac3915ab75b5007 ]

netpoll_send_skb_on_dev() can get the device pointer directly from np->dev

Rename it to __netpoll_send_skb()

Following patch will move netpoll_send_skb() out-of-line.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Stable-dep-of: 505ead7ab77f ("netpoll: hold rcu read lock in __netpoll_send_skb()")
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
include/linux/netpoll.h | 5 ++---
net/core/netpoll.c | 10 ++++++----
2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/include/linux/netpoll.h b/include/linux/netpoll.h
index 3ff0303672842..f5202a59c0274 100644
--- a/include/linux/netpoll.h
+++ b/include/linux/netpoll.h
@@ -63,13 +63,12 @@ int netpoll_setup(struct netpoll *np);
void __netpoll_cleanup(struct netpoll *np);
void __netpoll_free(struct netpoll *np);
void netpoll_cleanup(struct netpoll *np);
-void netpoll_send_skb_on_dev(struct netpoll *np, struct sk_buff *skb,
- struct net_device *dev);
+void __netpoll_send_skb(struct netpoll *np, struct sk_buff *skb);
static inline void netpoll_send_skb(struct netpoll *np, struct sk_buff *skb)
{
unsigned long flags;
local_irq_save(flags);
- netpoll_send_skb_on_dev(np, skb, np->dev);
+ __netpoll_send_skb(np, skb);
local_irq_restore(flags);
}

diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index 35a3277ee3567..69f80b531a1c3 100644
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -323,17 +323,19 @@ static int netpoll_owner_active(struct net_device *dev)
}

/* call with IRQ disabled */
-void netpoll_send_skb_on_dev(struct netpoll *np, struct sk_buff *skb,
- struct net_device *dev)
+void __netpoll_send_skb(struct netpoll *np, struct sk_buff *skb)
{
netdev_tx_t status = NETDEV_TX_BUSY;
+ struct net_device *dev;
unsigned long tries;
/* It is up to the caller to keep npinfo alive. */
struct netpoll_info *npinfo;

lockdep_assert_irqs_disabled();

- npinfo = rcu_dereference_bh(np->dev->npinfo);
+ dev = np->dev;
+ npinfo = rcu_dereference_bh(dev->npinfo);
+
if (!npinfo || !netif_running(dev) || !netif_device_present(dev)) {
dev_kfree_skb_irq(skb);
return;
@@ -376,7 +378,7 @@ void netpoll_send_skb_on_dev(struct netpoll *np, struct sk_buff *skb,
schedule_delayed_work(&npinfo->tx_work,0);
}
}
-EXPORT_SYMBOL(netpoll_send_skb_on_dev);
+EXPORT_SYMBOL(__netpoll_send_skb);

void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
{
--
2.39.5