This patch changes the queued transmit path of netpoll, to
use similar logic to the non-queued path. We don't want netpoll
messages going into NIT and network qdisc logic.
Signed-off-by: Stephen Hemminger <[email protected]>
--- netpoll.orig/net/core/netpoll.c
+++ netpoll/net/core/netpoll.c
@@ -51,13 +51,27 @@ static atomic_t trapped;
static void zap_completion_queue(void);
static void arp_reply(struct sk_buff *skb);
+static void queue_process(void *);
+static DECLARE_WORK(send_queue, queue_process, NULL);
+
static void queue_process(void *p)
{
struct sk_buff *skb;
- while ((skb = skb_dequeue(&netpoll_txq)))
- dev_queue_xmit(skb);
+ while ((skb = skb_dequeue(&netpoll_txq))) {
+ struct net_device *dev = skb->dev;
+ netif_tx_lock_bh(dev);
+ if (netif_queue_stopped(dev) ||
+ dev->hard_start_xmit(skb, dev) != NETDEV_TX_OK) {
+ skb_queue_head(&netpoll_txq, skb);
+ netif_tx_unlock_bh(dev);
+
+ schedule_delayed_work(&send_queue, 1);
+ return;
+ }
+ netif_tx_unlock_bh(dev);
+ }
}
static void queue_purge(struct net_device *dev)
@@ -77,8 +91,6 @@ static void queue_purge(struct net_devic
spin_unlock_irqrestore(&netpoll_txq.lock, flags);
}
-static DECLARE_WORK(send_queue, queue_process, NULL);
-
void netpoll_queue(struct sk_buff *skb)
{
skb_queue_tail(&netpoll_txq, skb);