From 00917486a6ef0fb15d323b15979d2310510f6c4e Mon Sep 17 00:00:00 2001 From: Herbert Xu Date: Tue, 15 Jun 2010 21:44:29 -0700 Subject: [PATCH] --- yaml --- r: 202965 b: refs/heads/master c: d5f31fbfd8fa3836a918592032853c41d1797c3d h: refs/heads/master i: 202963: c5a4ae26bfd6bba9c996171256aa233a1514b846 v: v3 --- [refs] | 2 +- trunk/include/linux/netpoll.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1f5c7c08ae6e..0f80dbca94c5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9f70b0fcecd134890affe627aa2823591313a413 +refs/heads/master: d5f31fbfd8fa3836a918592032853c41d1797c3d diff --git a/trunk/include/linux/netpoll.h b/trunk/include/linux/netpoll.h index 4c77fe78ceff..413742c92d14 100644 --- a/trunk/include/linux/netpoll.h +++ b/trunk/include/linux/netpoll.h @@ -64,7 +64,7 @@ static inline bool netpoll_rx(struct sk_buff *skb) bool ret = false; rcu_read_lock_bh(); - npinfo = rcu_dereference(skb->dev->npinfo); + npinfo = rcu_dereference_bh(skb->dev->npinfo); if (!npinfo || (list_empty(&npinfo->rx_np) && !npinfo->rx_flags)) goto out; @@ -82,7 +82,7 @@ static inline bool netpoll_rx(struct sk_buff *skb) static inline int netpoll_rx_on(struct sk_buff *skb) { - struct netpoll_info *npinfo = rcu_dereference(skb->dev->npinfo); + struct netpoll_info *npinfo = rcu_dereference_bh(skb->dev->npinfo); return npinfo && (!list_empty(&npinfo->rx_np) || npinfo->rx_flags); }