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 <[email protected]> Fixes: 705cc62 ("vxlan: provide access function for vxlan socket address family") Signed-off-by: Jiri Benc <[email protected]> Signed-off-by: David S. Miller <[email protected]>
iegor · Aug 25, 2015 · 48e92c4 · 48e92c4
1 parent 081958e
commit 48e92c4
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/include/net/vxlan.h b/include/net/vxlan.h
@@ -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