AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

netpoll: netpoll_send_skb() returns transmit status

Browse Source 
Some callers want to know if the packet has been sent or
dropped, to inform upper stacks.

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:20 -07:00 committed by David S. Miller
parent fb1eee476b
commit 1ddabdfaf7
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/netpoll.h
View File

@ -63,7 +63,7 @@ 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(struct netpoll *np, struct sk_buff *skb); netdev_tx_t netpoll_send_skb(struct netpoll *np, struct sk_buff *skb);
#ifdef CONFIG_NETPOLL #ifdef CONFIG_NETPOLL
static inline void *netpoll_poll_lock(struct napi_struct *napi) static inline void *netpoll_poll_lock(struct napi_struct *napi)

11
net/core/netpoll.c
View File

@ -305,7 +305,7 @@ static int netpoll_owner_active(struct net_device *dev)
} }
/* call with IRQ disabled */ /* call with IRQ disabled */
static void __netpoll_send_skb(struct netpoll *np, struct sk_buff *skb) static netdev_tx_t __netpoll_send_skb(struct netpoll *np, struct sk_buff *skb)
{ {
netdev_tx_t status = NETDEV_TX_BUSY; netdev_tx_t status = NETDEV_TX_BUSY;
struct net_device *dev; struct net_device *dev;
@ -320,7 +320,7 @@ static void __netpoll_send_skb(struct netpoll *np, struct sk_buff *skb)
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 NET_XMIT_DROP;
} }
/* don't get messages out of order, and no recursion */ /* don't get messages out of order, and no recursion */
@ -359,15 +359,18 @@ static void __netpoll_send_skb(struct netpoll *np, struct sk_buff *skb)
skb_queue_tail(&npinfo->txq, skb); skb_queue_tail(&npinfo->txq, skb);
schedule_delayed_work(&npinfo->tx_work,0); schedule_delayed_work(&npinfo->tx_work,0);
} }
return NETDEV_TX_OK;
} }
void netpoll_send_skb(struct netpoll *np, struct sk_buff *skb) netdev_tx_t netpoll_send_skb(struct netpoll *np, struct sk_buff *skb)
{ {
unsigned long flags; unsigned long flags;
netdev_tx_t ret;
local_irq_save(flags); local_irq_save(flags);
__netpoll_send_skb(np, skb); ret = __netpoll_send_skb(np, skb);
local_irq_restore(flags); local_irq_restore(flags);
return ret;
} }
EXPORT_SYMBOL(netpoll_send_skb); EXPORT_SYMBOL(netpoll_send_skb);