mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-06-21 14:11:20 +00:00
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: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
9f70b0fcec
commit
d5f31fbfd8
1 changed files with 2 additions and 2 deletions
|
@ -64,7 +64,7 @@ static inline bool netpoll_rx(struct sk_buff *skb)
|
||||||
bool ret = false;
|
bool ret = false;
|
||||||
|
|
||||||
rcu_read_lock_bh();
|
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))
|
if (!npinfo || (list_empty(&npinfo->rx_np) && !npinfo->rx_flags))
|
||||||
goto out;
|
goto out;
|
||||||
|
@ -82,7 +82,7 @@ out:
|
||||||
|
|
||||||
static inline int netpoll_rx_on(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);
|
return npinfo && (!list_empty(&npinfo->rx_np) || npinfo->rx_flags);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue