Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
	drivers/net/ethernet/emulex/benet/be.h
	drivers/net/usb/qmi_wwan.c
	drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h
	include/net/netfilter/nf_conntrack_synproxy.h
	include/net/secure_seq.h

The conflicts are of two varieties:

1) Conflicts with Joe Perches's 'extern' removal from header file
   function declarations.  Usually it's an argument signature change
   or a function being added/removed.  The resolutions are trivial.

2) Some overlapping changes in qmi_wwan.c and be.h, one commit adds
   a new value, another changes an existing value.  That sort of
   thing.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 3 insertions, 6 deletions

diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
index c376be7b528a..da8479479d01 100644
--- a/drivers/net/vxlan.c
+++ b/drivers/net/vxlan.c
@@ -952,8 +952,7 @@ void vxlan_sock_release(struct vxlan_sock *vs)
 
         spin_lock(&vn->sock_lock);
         hlist_del_rcu(&vs->hlist);
-        smp_wmb();
-        vs->sock->sk->sk_user_data = NULL;
+        rcu_assign_sk_user_data(vs->sock->sk, NULL);
         vxlan_notify_del_rx_port(sk);
         spin_unlock(&vn->sock_lock);
 
@@ -1048,8 +1047,7 @@ static int vxlan_udp_encap_recv(struct sock *sk, struct sk_buff *skb)
 
         port = inet_sk(sk)->inet_sport;
 
-        smp_read_barrier_depends();
-        vs = (struct vxlan_sock *)sk->sk_user_data;
+        vs = rcu_dereference_sk_user_data(sk);
         if (!vs)
                 goto drop;
 
@@ -2302,8 +2300,7 @@ static struct vxlan_sock *vxlan_socket_create(struct net *net, __be16 port,
         atomic_set(&vs->refcnt, 1);
         vs->rcv = rcv;
         vs->data = data;
-        smp_wmb();
-        vs->sock->sk->sk_user_data = vs;
+        rcu_assign_sk_user_data(vs->sock->sk, vs);
 
         spin_lock(&vn->sock_lock);
         hlist_add_head_rcu(&vs->hlist, vs_head(net, port));