korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-14 15:54:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

netpoll: remove dev argument from netpoll_send_skb_on_dev()

Browse Source 
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>
This commit is contained in:
Eric Dumazet 2020-05-07 09:32:18 -07:00 committed by David S. Miller
parent 3a13f98b4c
commit 307f660d05
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/linux/netpoll.h
View File

@ -63,13 +63,12 @@ int netpoll_setup(struct netpoll *np);
void __netpoll_cleanup(struct netpoll *np); void __netpoll_cleanup(struct netpoll *np);
void __netpoll_free(struct netpoll *np); void __netpoll_free(struct netpoll *np);
void netpoll_cleanup(struct netpoll *np); void netpoll_cleanup(struct netpoll *np);
void netpoll_send_skb_on_dev(struct netpoll *np, struct sk_buff *skb, void __netpoll_send_skb(struct netpoll *np, struct sk_buff *skb);
struct net_device *dev);
static inline 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; unsigned long flags;
local_irq_save(flags); local_irq_save(flags);
netpoll_send_skb_on_dev(np, skb, np->dev); __netpoll_send_skb(np, skb);
local_irq_restore(flags); local_irq_restore(flags);
} }

10
net/core/netpoll.c
View File

@ -305,17 +305,19 @@ static int netpoll_owner_active(struct net_device *dev)
} }
/* call with IRQ disabled */ /* call with IRQ disabled */
void netpoll_send_skb_on_dev(struct netpoll *np, struct sk_buff *skb, void __netpoll_send_skb(struct netpoll *np, struct sk_buff *skb)
struct net_device *dev)
{ {
netdev_tx_t status = NETDEV_TX_BUSY; netdev_tx_t status = NETDEV_TX_BUSY;
struct net_device *dev;
unsigned long tries; unsigned long tries;
/* It is up to the caller to keep npinfo alive. */ /* It is up to the caller to keep npinfo alive. */
struct netpoll_info *npinfo; struct netpoll_info *npinfo;
lockdep_assert_irqs_disabled(); 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)) { if (!npinfo || !netif_running(dev) || !netif_device_present(dev)) {
dev_kfree_skb_irq(skb); dev_kfree_skb_irq(skb);
return; return;
@ -358,7 +360,7 @@ void netpoll_send_skb_on_dev(struct netpoll *np, struct sk_buff *skb,
schedule_delayed_work(&npinfo->tx_work,0); 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) void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
{ {