* [PATCH net-next 1/2] openvswitch: Allow GRE ports when compiled as a module.
@ 2013-06-21 23:17 Jesse Gross
2013-06-21 23:17 ` [PATCH net-next 2/2] ip_tunnel: Protect tunnel functions with CONFIG_INET guard Jesse Gross
2013-06-24 7:19 ` [PATCH net-next 1/2] openvswitch: Allow GRE ports when compiled as a module David Miller
0 siblings, 2 replies; 5+ messages in thread
From: Jesse Gross @ 2013-06-21 23:17 UTC (permalink / raw)
To: David Miller; +Cc: netdev, dev, Pravin Shelar, Jesse Gross
Open vSwitch GRE tunnels are currently only enabled if the GRE
datapath code is statically compiled in but it should be possible
to use it as a module as well.
CC: Pravin Shelar <pshelar@nicira.com>
Signed-off-by: Jesse Gross <jesse@nicira.com>
---
net/openvswitch/vport-gre.c | 2 +-
net/openvswitch/vport.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/openvswitch/vport-gre.c b/net/openvswitch/vport-gre.c
index 3a8d190..943e5c4 100644
--- a/net/openvswitch/vport-gre.c
+++ b/net/openvswitch/vport-gre.c
@@ -16,7 +16,7 @@
* 02110-1301, USA
*/
-#ifdef CONFIG_NET_IPGRE_DEMUX
+#if IS_ENABLED(CONFIG_NET_IPGRE_DEMUX)
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/if.h>
diff --git a/net/openvswitch/vport.c b/net/openvswitch/vport.c
index f52dfb9..ba81294 100644
--- a/net/openvswitch/vport.c
+++ b/net/openvswitch/vport.c
@@ -39,7 +39,7 @@ static const struct vport_ops *vport_ops_list[] = {
&ovs_netdev_vport_ops,
&ovs_internal_vport_ops,
-#ifdef CONFIG_NET_IPGRE_DEMUX
+#if IS_ENABLED(CONFIG_NET_IPGRE_DEMUX)
&ovs_gre_vport_ops,
#endif
};
--
1.8.1.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH net-next 2/2] ip_tunnel: Protect tunnel functions with CONFIG_INET guard.
2013-06-21 23:17 [PATCH net-next 1/2] openvswitch: Allow GRE ports when compiled as a module Jesse Gross
@ 2013-06-21 23:17 ` Jesse Gross
2013-06-22 3:46 ` Randy Dunlap
2013-06-24 7:19 ` David Miller
2013-06-24 7:19 ` [PATCH net-next 1/2] openvswitch: Allow GRE ports when compiled as a module David Miller
1 sibling, 2 replies; 5+ messages in thread
From: Jesse Gross @ 2013-06-21 23:17 UTC (permalink / raw)
To: David Miller; +Cc: netdev, dev, Pravin Shelar, Randy Dunlap, Jesse Gross
Tunnel constants can be used in generic code but in these cases
the inline functions in ip_tunnels.h cause compilation problems
if CONFIG_INET is not set.
CC: Pravin Shelar <pshelar@nicira.com>
Reported-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Jesse Gross <jesse@nicira.com>
---
include/net/ip_tunnels.h | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/include/net/ip_tunnels.h b/include/net/ip_tunnels.h
index 10bbb42..b0d9824 100644
--- a/include/net/ip_tunnels.h
+++ b/include/net/ip_tunnels.h
@@ -93,6 +93,8 @@ struct ip_tunnel_net {
struct net_device *fb_tunnel_dev;
};
+#ifdef CONFIG_INET
+
int ip_tunnel_init(struct net_device *dev);
void ip_tunnel_uninit(struct net_device *dev);
void ip_tunnel_dellink(struct net_device *dev, struct list_head *head);
@@ -180,4 +182,7 @@ static inline void iptunnel_xmit_stats(int err,
err_stats->tx_dropped++;
}
}
+
+#endif /* CONFIG_INET */
+
#endif /* __NET_IP_TUNNELS_H */
--
1.8.1.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH net-next 2/2] ip_tunnel: Protect tunnel functions with CONFIG_INET guard.
2013-06-21 23:17 ` [PATCH net-next 2/2] ip_tunnel: Protect tunnel functions with CONFIG_INET guard Jesse Gross
@ 2013-06-22 3:46 ` Randy Dunlap
2013-06-24 7:19 ` David Miller
1 sibling, 0 replies; 5+ messages in thread
From: Randy Dunlap @ 2013-06-22 3:46 UTC (permalink / raw)
To: Jesse Gross; +Cc: David Miller, netdev, dev, Pravin Shelar
On 06/21/13 16:17, Jesse Gross wrote:
> Tunnel constants can be used in generic code but in these cases
> the inline functions in ip_tunnels.h cause compilation problems
> if CONFIG_INET is not set.
>
> CC: Pravin Shelar <pshelar@nicira.com>
> Reported-by: Randy Dunlap <rdunlap@infradead.org>
> Signed-off-by: Jesse Gross <jesse@nicira.com>
Acked-by: Randy Dunlap <rdunlap@infradead.org>
Thanks.
> ---
> include/net/ip_tunnels.h | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/include/net/ip_tunnels.h b/include/net/ip_tunnels.h
> index 10bbb42..b0d9824 100644
> --- a/include/net/ip_tunnels.h
> +++ b/include/net/ip_tunnels.h
> @@ -93,6 +93,8 @@ struct ip_tunnel_net {
> struct net_device *fb_tunnel_dev;
> };
>
> +#ifdef CONFIG_INET
> +
> int ip_tunnel_init(struct net_device *dev);
> void ip_tunnel_uninit(struct net_device *dev);
> void ip_tunnel_dellink(struct net_device *dev, struct list_head *head);
> @@ -180,4 +182,7 @@ static inline void iptunnel_xmit_stats(int err,
> err_stats->tx_dropped++;
> }
> }
> +
> +#endif /* CONFIG_INET */
> +
> #endif /* __NET_IP_TUNNELS_H */
>
--
~Randy
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH net-next 1/2] openvswitch: Allow GRE ports when compiled as a module.
2013-06-21 23:17 [PATCH net-next 1/2] openvswitch: Allow GRE ports when compiled as a module Jesse Gross
2013-06-21 23:17 ` [PATCH net-next 2/2] ip_tunnel: Protect tunnel functions with CONFIG_INET guard Jesse Gross
@ 2013-06-24 7:19 ` David Miller
1 sibling, 0 replies; 5+ messages in thread
From: David Miller @ 2013-06-24 7:19 UTC (permalink / raw)
To: jesse; +Cc: netdev, dev, pshelar
From: Jesse Gross <jesse@nicira.com>
Date: Fri, 21 Jun 2013 16:17:10 -0700
> Open vSwitch GRE tunnels are currently only enabled if the GRE
> datapath code is statically compiled in but it should be possible
> to use it as a module as well.
>
> CC: Pravin Shelar <pshelar@nicira.com>
> Signed-off-by: Jesse Gross <jesse@nicira.com>
Pravin's copy of this same exact patch hit my inbox first, so I applied
his. Thanks.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH net-next 2/2] ip_tunnel: Protect tunnel functions with CONFIG_INET guard.
2013-06-21 23:17 ` [PATCH net-next 2/2] ip_tunnel: Protect tunnel functions with CONFIG_INET guard Jesse Gross
2013-06-22 3:46 ` Randy Dunlap
@ 2013-06-24 7:19 ` David Miller
1 sibling, 0 replies; 5+ messages in thread
From: David Miller @ 2013-06-24 7:19 UTC (permalink / raw)
To: jesse; +Cc: netdev, dev, pshelar, rdunlap
From: Jesse Gross <jesse@nicira.com>
Date: Fri, 21 Jun 2013 16:17:11 -0700
> Tunnel constants can be used in generic code but in these cases
> the inline functions in ip_tunnels.h cause compilation problems
> if CONFIG_INET is not set.
>
> CC: Pravin Shelar <pshelar@nicira.com>
> Reported-by: Randy Dunlap <rdunlap@infradead.org>
> Signed-off-by: Jesse Gross <jesse@nicira.com>
Applied.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-06-24 7:19 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-06-21 23:17 [PATCH net-next 1/2] openvswitch: Allow GRE ports when compiled as a module Jesse Gross
2013-06-21 23:17 ` [PATCH net-next 2/2] ip_tunnel: Protect tunnel functions with CONFIG_INET guard Jesse Gross
2013-06-22 3:46 ` Randy Dunlap
2013-06-24 7:19 ` David Miller
2013-06-24 7:19 ` [PATCH net-next 1/2] openvswitch: Allow GRE ports when compiled as a module David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.