Commit d5f31fbf authored by Herbert Xu's avatar Herbert Xu Committed by David S. Miller
Browse files

netpoll: Use correct primitives for RCU dereferencing 



Now that RCU debugging checks for matching rcu_dereference calls
and rcu_read_lock, we need to use the correct primitives or face
nasty warnings.

Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9f70b0fc

include/linux/netpoll.h

+2 −2
Original line number Diff line number Diff line
@@ -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 @@ out: 


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);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE