From 071c1db1257bcf8f214d7e6f68b108c2e2a0817c Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Tue, 12 Dec 2006 17:20:42 +0100 Subject: [PATCH] --- yaml --- r: 44333 b: refs/heads/master c: 3640543df26fd38f31f0c6decc35c07be2a6307c h: refs/heads/master i: 44331: 49e23643c538c8a0caddbe778da9c13d0f15485b v: v3 --- [refs] | 2 +- trunk/net/core/netpoll.c | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 14eb475daf83..4289d178b2f4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d224a93d91610fc641fbc5b234b32fcb84045a30 +refs/heads/master: 3640543df26fd38f31f0c6decc35c07be2a6307c diff --git a/trunk/net/core/netpoll.c b/trunk/net/core/netpoll.c index a01abdd2d3ea..823215d8e90f 100644 --- a/trunk/net/core/netpoll.c +++ b/trunk/net/core/netpoll.c @@ -55,6 +55,7 @@ static void queue_process(struct work_struct *work) struct netpoll_info *npinfo = container_of(work, struct netpoll_info, tx_work.work); struct sk_buff *skb; + unsigned long flags; while ((skb = skb_dequeue(&npinfo->txq))) { struct net_device *dev = skb->dev; @@ -64,15 +65,19 @@ static void queue_process(struct work_struct *work) continue; } - netif_tx_lock_bh(dev); + local_irq_save(flags); + netif_tx_lock(dev); if (netif_queue_stopped(dev) || dev->hard_start_xmit(skb, dev) != NETDEV_TX_OK) { skb_queue_head(&npinfo->txq, skb); - netif_tx_unlock_bh(dev); + netif_tx_unlock(dev); + local_irq_restore(flags); schedule_delayed_work(&npinfo->tx_work, HZ/10); return; } + netif_tx_unlock(dev); + local_irq_restore(flags); } }