Commit 48e92c44 authored by Jiri Benc's avatar Jiri Benc Committed by David S. Miller

vxlan: fix multiple inclusion of vxlan.h

The vxlan_get_sk_family inline function was added after the last #endif,
making multiple inclusion of net/vxlan.h fail. Move it to the proper place.
Reported-by: default avatarMark Rustad <mark.d.rustad@intel.com>
Fixes: 705cc62f ("vxlan: provide access function for vxlan socket address family")
Signed-off-by: default avatarJiri Benc <jbenc@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 081958eb
...@@ -241,9 +241,10 @@ static inline void vxlan_get_rx_port(struct net_device *netdev) ...@@ -241,9 +241,10 @@ static inline void vxlan_get_rx_port(struct net_device *netdev)
{ {
} }
#endif #endif
#endif
static inline unsigned short vxlan_get_sk_family(struct vxlan_sock *vs) static inline unsigned short vxlan_get_sk_family(struct vxlan_sock *vs)
{ {
return vs->sock->sk->sk_family; return vs->sock->sk->sk_family;
} }
#endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment