diff options
| author | Eric Dumazet <edumazet@google.com> | 2014-07-02 02:39:38 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-28 08:00:04 -0700 |
| commit | 4d8eb541f3bed4daf65dc188e7aa0824b1ac0d75 (patch) | |
| tree | 27af5af1760a2075ceda3c45e629dafe480801f5 | |
| parent | f1e1b06f19e1ddcebcee56ba33845ded7bf719ac (diff) | |
| download | linux-3.10-4d8eb541f3bed4daf65dc188e7aa0824b1ac0d75.tar.gz linux-3.10-4d8eb541f3bed4daf65dc188e7aa0824b1ac0d75.tar.bz2 linux-3.10-4d8eb541f3bed4daf65dc188e7aa0824b1ac0d75.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>
| -rw-r--r-- | include/net/sock.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index 4d2358113da..26b15c0780b 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -1770,7 +1770,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); } |