Merge tag 'kvm-s390-next-6.4-2' of https://git.kernel.org/pub/scm/linux/kernel/git...

[linux-block.git] / include / net / ndisc.h

diff --git a/include/net/ndisc.h b/include/net/ndisc.h
index 07e5168cdaf9a5a5a180a2d97c646552655982ce..52eae09434335dae0d9602d5027f45100bb47253 100644 (file)
--- a/include/net/ndisc.h
+++ b/include/net/ndisc.h
@@ -395,11 +395,11 @@ static inline struct neighbour *__ipv6_neigh_lookup(struct net_device *dev, cons
 {
        struct neighbour *n;
 
-       rcu_read_lock_bh();
+       rcu_read_lock();
        n = __ipv6_neigh_lookup_noref(dev, pkey);
        if (n && !refcount_inc_not_zero(&n->refcnt))
                n = NULL;
-       rcu_read_unlock_bh();
+       rcu_read_unlock();
 
        return n;
 }
@@ -409,10 +409,10 @@ static inline void __ipv6_confirm_neigh(struct net_device *dev,
 {
        struct neighbour *n;
 
-       rcu_read_lock_bh();
+       rcu_read_lock();
        n = __ipv6_neigh_lookup_noref(dev, pkey);
        neigh_confirm(n);
-       rcu_read_unlock_bh();
+       rcu_read_unlock();
 }
 
 static inline void __ipv6_confirm_neigh_stub(struct net_device *dev,
@@ -420,10 +420,10 @@ static inline void __ipv6_confirm_neigh_stub(struct net_device *dev,
 {
        struct neighbour *n;
 
-       rcu_read_lock_bh();
+       rcu_read_lock();
        n = __ipv6_neigh_lookup_noref_stub(dev, pkey);
        neigh_confirm(n);
-       rcu_read_unlock_bh();
+       rcu_read_unlock();
 }
 
 /* uses ipv6_stub and is meant for use outside of IPv6 core */