From a7177377b09d59cbdae015dece38a0e19f423746 Mon Sep 17 00:00:00 2001 From: Herbert Xu Date: Fri, 17 Sep 2010 16:55:03 -0700 Subject: [PATCH] --- yaml --- r: 210820 b: refs/heads/master c: f0f9deae9e7c421fa0c1c627beb8e174325e1ba7 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/netpoll.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 92cf7d2733b5..8fb22341a8f1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4bdab43323b459900578b200a4b8cf9713ac8fab +refs/heads/master: f0f9deae9e7c421fa0c1c627beb8e174325e1ba7 diff --git a/trunk/include/linux/netpoll.h b/trunk/include/linux/netpoll.h index 791d5109f34c..50d8009be86c 100644 --- a/trunk/include/linux/netpoll.h +++ b/trunk/include/linux/netpoll.h @@ -63,20 +63,20 @@ static inline bool netpoll_rx(struct sk_buff *skb) unsigned long flags; bool ret = false; - rcu_read_lock_bh(); + local_irq_save(flags); npinfo = rcu_dereference_bh(skb->dev->npinfo); if (!npinfo || (list_empty(&npinfo->rx_np) && !npinfo->rx_flags)) goto out; - spin_lock_irqsave(&npinfo->rx_lock, flags); + spin_lock(&npinfo->rx_lock); /* check rx_flags again with the lock held */ if (npinfo->rx_flags && __netpoll_rx(skb)) ret = true; - spin_unlock_irqrestore(&npinfo->rx_lock, flags); + spin_unlock(&npinfo->rx_lock); out: - rcu_read_unlock_bh(); + local_irq_restore(flags); return ret; }