summaryrefslogtreecommitdiff
path: root/net/core/netpoll.c
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2020-05-07 19:32:20 +0300
committerDavid S. Miller <davem@davemloft.net>2020-05-08 04:11:07 +0300
commit1ddabdfaf70c202b88925edd74c66f4707dbd92e (patch)
tree054aa6cba9525f277fcc333a4cacfaa8abc0418e /net/core/netpoll.c
parentfb1eee476b0d3be3e58dac1a3a96f726c6278bed (diff)
downloadlinux-1ddabdfaf70c202b88925edd74c66f4707dbd92e.tar.xz
netpoll: netpoll_send_skb() returns transmit status
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>
Diffstat (limited to 'net/core/netpoll.c')
-rw-r--r--net/core/netpoll.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index 34cd34f24423..40d2753aa47d 100644
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -305,7 +305,7 @@ static int netpoll_owner_active(struct net_device *dev)
}
/* 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;
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)) {
dev_kfree_skb_irq(skb);
- return;
+ return NET_XMIT_DROP;
}
/* 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);
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;
+ netdev_tx_t ret;
local_irq_save(flags);
- __netpoll_send_skb(np, skb);
+ ret = __netpoll_send_skb(np, skb);
local_irq_restore(flags);
+ return ret;
}
EXPORT_SYMBOL(netpoll_send_skb);