Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

vxlan: fix multiple inclusion of vxlan.h

Browse source 
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: Mark Rustad <mark.d.rustad@intel.com>
Fixes: 705cc62f67 ("vxlan: provide access function for vxlan socket address family")
Signed-off-by: Jiri Benc <jbenc@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jiri Benc 2015-08-25 18:36:50 +02:00 committed by David S. Miller
parent 081958ebe1
commit 48e92c44bd
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/net/vxlan.h
View file

@ -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