summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2014-07-02 02:39:38 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-07-28 08:05:59 -0700
commitfde40bdfda59c317d9b130b21a569f3285e269e4 (patch)
treefe3ab777f873acb1b379cb88c3bcd7dcee62329c /include
parentcd6893fae616cb894b661a3919ecb74c8ea4c34d (diff)
downloadlinux-stable-fde40bdfda59c317d9b130b21a569f3285e269e4.tar.gz
linux-stable-fde40bdfda59c317d9b130b21a569f3285e269e4.tar.bz2
linux-stable-fde40bdfda59c317d9b130b21a569f3285e269e4.zip
net: fix sparse warning in sk_dst_set()
[ Upstream commit 5925a0555bdaf0b396a84318cbc21ba085f6c0d3 ] 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include')
-rw-r--r--include/net/sock.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/sock.h b/include/net/sock.h
index 5cff69001e4e..2f7bc435c93d 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -1796,7 +1796,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);
}