* [PATCH net-next] vxlan: fix multiple inclusion of vxlan.h
@ 2015-08-25 16:36 Jiri Benc
2015-08-25 18:45 ` Cong Wang
2015-08-25 21:32 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Jiri Benc @ 2015-08-25 16:36 UTC (permalink / raw)
To: netdev; +Cc: Mark Rustad
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>
---
include/net/vxlan.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
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
--
1.8.3.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH net-next] vxlan: fix multiple inclusion of vxlan.h
2015-08-25 16:36 [PATCH net-next] vxlan: fix multiple inclusion of vxlan.h Jiri Benc
@ 2015-08-25 18:45 ` Cong Wang
2015-08-25 21:32 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Cong Wang @ 2015-08-25 18:45 UTC (permalink / raw)
To: Jiri Benc; +Cc: netdev, Mark Rustad
On Tue, Aug 25, 2015 at 9:36 AM, Jiri Benc <jbenc@redhat.com> wrote:
> 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.
>
Or move it even further into #if IS_ENABLED(CONFIG_VXLAN) ?
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH net-next] vxlan: fix multiple inclusion of vxlan.h
2015-08-25 16:36 [PATCH net-next] vxlan: fix multiple inclusion of vxlan.h Jiri Benc
2015-08-25 18:45 ` Cong Wang
@ 2015-08-25 21:32 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2015-08-25 21:32 UTC (permalink / raw)
To: jbenc; +Cc: netdev, mark.d.rustad
From: Jiri Benc <jbenc@redhat.com>
Date: Tue, 25 Aug 2015 18:36:50 +0200
> 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>
Applied, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-08-25 21:32 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-08-25 16:36 [PATCH net-next] vxlan: fix multiple inclusion of vxlan.h Jiri Benc
2015-08-25 18:45 ` Cong Wang
2015-08-25 21:32 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).