]> git.ipfire.org Git - thirdparty/kernel/stable.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)
committerJiri Slaby <jslaby@suse.cz>
Thu, 9 Apr 2015 12:13:51 +0000 (14:13 +0200)
commit 5925a0555bdaf0b396a84318cbc21ba085f6c0d3 upstream.

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: 7f502361531e ("ipv4: irq safe sk_dst_[re]set() and ipv4_sk_update_pmtu() fix")
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
include/net/sock.h

index 3899018a6b21a1619195692f6a494682acef3373..d157f4f56f012c9747613c79e4bc3fb8c4beba2c 100644 (file)
@@ -1791,7 +1791,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);
 }