]> git.baikalelectronics.ru Git - kernel.git/commitdiff
net: fix sparse warning in sk_dst_set()
authorEric Dumazet <edumazet@google.com>
Wed, 2 Jul 2014 09:39:38 +0000 (02:39 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 3 Jul 2014 00:03:06 +0000 (17:03 -0700)
sk_dst_cache has __rcu annotation, so we need a cast to avoid
following sparse error :

include/net/sock.h:1774:19: warning: incorrect type in initializer (different address spaces)
include/net/sock.h:1774:19:    expected struct dst_entry [noderef] <asn:4>*__ret
include/net/sock.h:1774:19:    got struct dst_entry *dst

Signed-off-by: Eric Dumazet <edumazet@google.com>
Reported-by: kbuild test robot <fengguang.wu@intel.com>
Fixes: f23182e7547f ("ipv4: irq safe sk_dst_[re]set() and ipv4_sk_update_pmtu() fix")
Signed-off-by: David S. Miller <davem@davemloft.net>
include/net/sock.h

index c556fd9b05acfbb9d8d9fa41a4ace5bffb11f4a9..1563507457002532edd3ad0dfd7419c3a8cde42a 100644 (file)
@@ -1771,7 +1771,7 @@ sk_dst_set(struct sock *sk, struct dst_entry *dst)
        struct dst_entry *old_dst;
 
        sk_tx_queue_clear(sk);
-       old_dst = xchg(&sk->sk_dst_cache, dst);
+       old_dst = xchg((__force struct dst_entry **)&sk->sk_dst_cache, dst);
        dst_release(old_dst);
 }