diff options
| author | Jiri Benc <jbenc@redhat.com> | 2015-08-25 18:36:50 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-08-25 14:32:04 -0700 |
| commit | 48e92c44bd73a8bc213560058e6b18e45929526e (patch) | |
| tree | 32defb5b430fc50644089a6fc0ecec3b37e0b194 | |
| parent | 081958ebe150dc42a0f50669169c4177786b747e (diff) | |
| download | linux-48e92c44bd73a8bc213560058e6b18e45929526e.tar.bz2 | |
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: 705cc62f6728c ("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>
| -rw-r--r-- | include/net/vxlan.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/net/vxlan.h b/include/net/vxlan.h index 6b3234599a2c..480a319b4c92 100644 --- 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 |