Commit 307f660d authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

netpoll: remove dev argument from netpoll_send_skb_on_dev() 



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: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3a13f98b

include/linux/netpoll.h

+2 −3
Original line number Diff line number Diff line
@@ -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);

}

net/core/netpoll.c

+6 −4
Original line number Diff line number Diff line
@@ -305,17 +305,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;
@@ -358,7 +360,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)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE