---

yaml --- r: 202965 b: refs/heads/master c: d5f31fb h: refs/heads/master i: 202963: c5a4ae2 v: v3
git-mirror · Jun 16, 2010 · 0091748 · 0091748
1 parent 06854aa
commit 0091748
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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);
 }