Commit 48e92c44 authored Aug 25, 2015 by Jiri Benc Committed by David S. Miller Aug 25, 2015

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: Mark Rustad <mark.d.rustad@intel.com>
Fixes: 705cc62f ("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>

parent 081958eb

include/net/vxlan.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -241,9 +241,10 @@ static inline void vxlan_get_rx_port(struct net_device *netdev)
		{
		}
		#endif
		#endif

		static inline unsigned short vxlan_get_sk_family(struct vxlan_sock *vs)
		{
		return vs->sock->sk->sk_family;
		}

		#endif