From: Alexander Duyck <aduyck@mirantis.com> To: netdev@vger.kernel.org, intel-wired-lan@lists.osuosl.org Cc: hannes@redhat.com, jesse@kernel.org, eugenia@mellanox.com, jbenc@redhat.com, alexander.duyck@gmail.com, saeedm@mellanox.com, ariel.elior@qlogic.com, tom@herbertland.com, michael.chan@broadcom.com, Dept-GELinuxNICDev@qlogic.com, davem@davemloft.net Subject: [net-next PATCH v3 01/17] vxlan/geneve: Include udp_tunnel.h in vxlan/geneve.h and fixup includes Date: Thu, 16 Jun 2016 12:20:44 -0700 [thread overview] Message-ID: <20160616192044.20872.17936.stgit@localhost.localdomain> (raw) In-Reply-To: <20160616191851.20872.67154.stgit@localhost.localdomain> This patch makes it so that we add udp_tunnel.h to vxlan.h and geneve.h header files. This is useful as I plan to move the generic handlers for the port offloads into the udp_tunnel header file and leave the vxlan and geneve headers to be a bit more protocol specific. I also went through and cleaned out a number of redundant includes that where in the .h and .c files for these drivers. Signed-off-by: Alexander Duyck <aduyck@mirantis.com> --- drivers/net/geneve.c | 1 - drivers/net/vxlan.c | 17 ----------------- include/net/geneve.h | 3 --- include/net/udp_tunnel.h | 2 ++ include/net/vxlan.h | 6 +----- 5 files changed, 3 insertions(+), 26 deletions(-) diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c index cadefe4fdaa2..e5e33cd01082 100644 --- a/drivers/net/geneve.c +++ b/drivers/net/geneve.c @@ -12,7 +12,6 @@ #include <linux/kernel.h> #include <linux/module.h> -#include <linux/netdevice.h> #include <linux/etherdevice.h> #include <linux/hash.h> #include <net/dst_metadata.h> diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c index f999db2f97b4..10ad41d60652 100644 --- a/drivers/net/vxlan.c +++ b/drivers/net/vxlan.c @@ -11,32 +11,18 @@ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt #include <linux/kernel.h> -#include <linux/types.h> #include <linux/module.h> #include <linux/errno.h> #include <linux/slab.h> -#include <linux/skbuff.h> -#include <linux/rculist.h> -#include <linux/netdevice.h> -#include <linux/in.h> -#include <linux/ip.h> #include <linux/udp.h> #include <linux/igmp.h> -#include <linux/etherdevice.h> #include <linux/if_ether.h> -#include <linux/if_vlan.h> -#include <linux/hash.h> #include <linux/ethtool.h> #include <net/arp.h> #include <net/ndisc.h> #include <net/ip.h> -#include <net/ip_tunnels.h> #include <net/icmp.h> -#include <net/udp.h> -#include <net/udp_tunnel.h> #include <net/rtnetlink.h> -#include <net/route.h> -#include <net/dsfield.h> #include <net/inet_ecn.h> #include <net/net_namespace.h> #include <net/netns/generic.h> @@ -44,12 +30,9 @@ #include <net/protocol.h> #if IS_ENABLED(CONFIG_IPV6) -#include <net/ipv6.h> -#include <net/addrconf.h> #include <net/ip6_tunnel.h> #include <net/ip6_checksum.h> #endif -#include <net/dst_metadata.h> #define VXLAN_VERSION "0.1" diff --git a/include/net/geneve.h b/include/net/geneve.h index cb544a530146..f8aff18d6702 100644 --- a/include/net/geneve.h +++ b/include/net/geneve.h @@ -1,10 +1,7 @@ #ifndef __NET_GENEVE_H #define __NET_GENEVE_H 1 -#ifdef CONFIG_INET #include <net/udp_tunnel.h> -#endif - /* Geneve Header: * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ diff --git a/include/net/udp_tunnel.h b/include/net/udp_tunnel.h index 9d14f707e534..59019562d14c 100644 --- a/include/net/udp_tunnel.h +++ b/include/net/udp_tunnel.h @@ -105,12 +105,14 @@ struct metadata_dst *udp_tun_rx_dst(struct sk_buff *skb, unsigned short family, __be16 flags, __be64 tunnel_id, int md_size); +#ifdef CONFIG_INET static inline int udp_tunnel_handle_offloads(struct sk_buff *skb, bool udp_csum) { int type = udp_csum ? SKB_GSO_UDP_TUNNEL_CSUM : SKB_GSO_UDP_TUNNEL; return iptunnel_handle_offloads(skb, type); } +#endif static inline void udp_tunnel_encap_enable(struct socket *sock) { diff --git a/include/net/vxlan.h b/include/net/vxlan.h index b8803165df91..7d944941f32f 100644 --- a/include/net/vxlan.h +++ b/include/net/vxlan.h @@ -1,12 +1,8 @@ #ifndef __NET_VXLAN_H #define __NET_VXLAN_H 1 -#include <linux/ip.h> -#include <linux/ipv6.h> #include <linux/if_vlan.h> -#include <linux/skbuff.h> -#include <linux/netdevice.h> -#include <linux/udp.h> +#include <net/udp_tunnel.h> #include <net/dst_metadata.h> /* VXLAN protocol (RFC 7348) header:
WARNING: multiple messages have this Message-ID (diff)
From: Alexander Duyck <aduyck@mirantis.com> To: intel-wired-lan@osuosl.org Subject: [Intel-wired-lan] [net-next PATCH v3 01/17] vxlan/geneve: Include udp_tunnel.h in vxlan/geneve.h and fixup includes Date: Thu, 16 Jun 2016 12:20:44 -0700 [thread overview] Message-ID: <20160616192044.20872.17936.stgit@localhost.localdomain> (raw) In-Reply-To: <20160616191851.20872.67154.stgit@localhost.localdomain> This patch makes it so that we add udp_tunnel.h to vxlan.h and geneve.h header files. This is useful as I plan to move the generic handlers for the port offloads into the udp_tunnel header file and leave the vxlan and geneve headers to be a bit more protocol specific. I also went through and cleaned out a number of redundant includes that where in the .h and .c files for these drivers. Signed-off-by: Alexander Duyck <aduyck@mirantis.com> --- drivers/net/geneve.c | 1 - drivers/net/vxlan.c | 17 ----------------- include/net/geneve.h | 3 --- include/net/udp_tunnel.h | 2 ++ include/net/vxlan.h | 6 +----- 5 files changed, 3 insertions(+), 26 deletions(-) diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c index cadefe4fdaa2..e5e33cd01082 100644 --- a/drivers/net/geneve.c +++ b/drivers/net/geneve.c @@ -12,7 +12,6 @@ #include <linux/kernel.h> #include <linux/module.h> -#include <linux/netdevice.h> #include <linux/etherdevice.h> #include <linux/hash.h> #include <net/dst_metadata.h> diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c index f999db2f97b4..10ad41d60652 100644 --- a/drivers/net/vxlan.c +++ b/drivers/net/vxlan.c @@ -11,32 +11,18 @@ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt #include <linux/kernel.h> -#include <linux/types.h> #include <linux/module.h> #include <linux/errno.h> #include <linux/slab.h> -#include <linux/skbuff.h> -#include <linux/rculist.h> -#include <linux/netdevice.h> -#include <linux/in.h> -#include <linux/ip.h> #include <linux/udp.h> #include <linux/igmp.h> -#include <linux/etherdevice.h> #include <linux/if_ether.h> -#include <linux/if_vlan.h> -#include <linux/hash.h> #include <linux/ethtool.h> #include <net/arp.h> #include <net/ndisc.h> #include <net/ip.h> -#include <net/ip_tunnels.h> #include <net/icmp.h> -#include <net/udp.h> -#include <net/udp_tunnel.h> #include <net/rtnetlink.h> -#include <net/route.h> -#include <net/dsfield.h> #include <net/inet_ecn.h> #include <net/net_namespace.h> #include <net/netns/generic.h> @@ -44,12 +30,9 @@ #include <net/protocol.h> #if IS_ENABLED(CONFIG_IPV6) -#include <net/ipv6.h> -#include <net/addrconf.h> #include <net/ip6_tunnel.h> #include <net/ip6_checksum.h> #endif -#include <net/dst_metadata.h> #define VXLAN_VERSION "0.1" diff --git a/include/net/geneve.h b/include/net/geneve.h index cb544a530146..f8aff18d6702 100644 --- a/include/net/geneve.h +++ b/include/net/geneve.h @@ -1,10 +1,7 @@ #ifndef __NET_GENEVE_H #define __NET_GENEVE_H 1 -#ifdef CONFIG_INET #include <net/udp_tunnel.h> -#endif - /* Geneve Header: * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ diff --git a/include/net/udp_tunnel.h b/include/net/udp_tunnel.h index 9d14f707e534..59019562d14c 100644 --- a/include/net/udp_tunnel.h +++ b/include/net/udp_tunnel.h @@ -105,12 +105,14 @@ struct metadata_dst *udp_tun_rx_dst(struct sk_buff *skb, unsigned short family, __be16 flags, __be64 tunnel_id, int md_size); +#ifdef CONFIG_INET static inline int udp_tunnel_handle_offloads(struct sk_buff *skb, bool udp_csum) { int type = udp_csum ? SKB_GSO_UDP_TUNNEL_CSUM : SKB_GSO_UDP_TUNNEL; return iptunnel_handle_offloads(skb, type); } +#endif static inline void udp_tunnel_encap_enable(struct socket *sock) { diff --git a/include/net/vxlan.h b/include/net/vxlan.h index b8803165df91..7d944941f32f 100644 --- a/include/net/vxlan.h +++ b/include/net/vxlan.h @@ -1,12 +1,8 @@ #ifndef __NET_VXLAN_H #define __NET_VXLAN_H 1 -#include <linux/ip.h> -#include <linux/ipv6.h> #include <linux/if_vlan.h> -#include <linux/skbuff.h> -#include <linux/netdevice.h> -#include <linux/udp.h> +#include <net/udp_tunnel.h> #include <net/dst_metadata.h> /* VXLAN protocol (RFC 7348) header:
next prev parent reply other threads:[~2016-06-16 19:20 UTC|newest] Thread overview: 82+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-06-16 19:20 [net-next PATCH v3 00/17] Future-proof tunnel offload handlers Alexander Duyck 2016-06-16 19:20 ` [Intel-wired-lan] " Alexander Duyck 2016-06-16 19:20 ` Alexander Duyck [this message] 2016-06-16 19:20 ` [Intel-wired-lan] [net-next PATCH v3 01/17] vxlan/geneve: Include udp_tunnel.h in vxlan/geneve.h and fixup includes Alexander Duyck 2016-06-16 23:06 ` Hannes Frederic Sowa 2016-06-16 23:06 ` [Intel-wired-lan] " Hannes Frederic Sowa 2016-06-16 19:20 ` [net-next PATCH v3 02/17] net: Combine GENEVE and VXLAN port notifiers into single functions Alexander Duyck 2016-06-16 19:20 ` [Intel-wired-lan] " Alexander Duyck 2016-06-16 22:45 ` Hannes Frederic Sowa 2016-06-16 22:45 ` [Intel-wired-lan] " Hannes Frederic Sowa 2016-06-16 19:21 ` [net-next PATCH v3 03/17] net: Merge VXLAN and GENEVE push notifiers into a single notifier Alexander Duyck 2016-06-16 19:21 ` [Intel-wired-lan] " Alexander Duyck 2016-06-16 22:47 ` Hannes Frederic Sowa 2016-06-16 22:47 ` [Intel-wired-lan] " Hannes Frederic Sowa 2016-06-16 19:21 ` [net-next PATCH v3 04/17] bnx2x: Move all UDP port notifiers to single function Alexander Duyck 2016-06-16 19:21 ` [Intel-wired-lan] " Alexander Duyck 2016-06-16 19:21 ` [net-next PATCH v3 05/17] bnxt: Update drivers to support unified UDP encapsulation offload functions Alexander Duyck 2016-06-16 19:21 ` [Intel-wired-lan] " Alexander Duyck 2016-06-16 19:21 ` [net-next PATCH v3 06/17] bnxt: Move GENEVE support from hard-coded port to using port notifier Alexander Duyck 2016-06-16 19:21 ` [Intel-wired-lan] " Alexander Duyck 2016-06-16 23:12 ` Michael Chan 2016-06-16 23:12 ` [Intel-wired-lan] " Michael Chan 2016-06-16 19:21 ` [net-next PATCH v3 07/17] benet: Replace ndo_add/del_vxlan_port with ndo_add/del_udp_enc_port Alexander Duyck 2016-06-16 19:21 ` [Intel-wired-lan] " Alexander Duyck 2016-06-16 19:21 ` [net-next PATCH v3 08/17] fm10k: " Alexander Duyck 2016-06-16 19:21 ` [Intel-wired-lan] " Alexander Duyck 2016-06-16 19:22 ` [net-next PATCH v3 09/17] i40e: Move all UDP port notifiers to single function Alexander Duyck 2016-06-16 19:22 ` [Intel-wired-lan] " Alexander Duyck 2016-06-16 19:22 ` [net-next PATCH v3 10/17] ixgbe: Replace ndo_add/del_vxlan_port with ndo_add/del_udp_enc_port Alexander Duyck 2016-06-16 19:22 ` [Intel-wired-lan] " Alexander Duyck 2016-06-16 19:22 ` [net-next PATCH v3 11/17] mlx4_en: " Alexander Duyck 2016-06-16 19:22 ` [Intel-wired-lan] " Alexander Duyck 2016-06-16 19:22 ` [net-next PATCH v3 12/17] mlx5_en: " Alexander Duyck 2016-06-16 19:22 ` [Intel-wired-lan] " Alexander Duyck 2016-06-16 19:22 ` [net-next PATCH v3 13/17] nfp: " Alexander Duyck 2016-06-16 19:22 ` [Intel-wired-lan] " Alexander Duyck 2016-06-16 19:22 ` [net-next PATCH v3 14/17] qede: Move all UDP port notifiers to single function Alexander Duyck 2016-06-16 19:22 ` [Intel-wired-lan] " Alexander Duyck 2016-06-16 19:23 ` [net-next PATCH v3 15/17] qlcnic: Replace ndo_add/del_vxlan_port with ndo_add/del_udp_enc_port Alexander Duyck 2016-06-16 19:23 ` [Intel-wired-lan] " Alexander Duyck 2016-06-16 19:23 ` [net-next PATCH v3 16/17] net: Remove deprecated tunnel specific UDP offload functions Alexander Duyck 2016-06-16 19:23 ` [Intel-wired-lan] " Alexander Duyck 2016-06-16 22:59 ` Hannes Frederic Sowa 2016-06-16 22:59 ` [Intel-wired-lan] " Hannes Frederic Sowa 2016-06-16 19:23 ` [net-next PATCH v3 17/17] vxlan: Add new UDP encapsulation offload type for VXLAN-GPE Alexander Duyck 2016-06-16 19:23 ` [Intel-wired-lan] " Alexander Duyck 2016-06-16 23:01 ` Hannes Frederic Sowa 2016-06-16 23:01 ` [Intel-wired-lan] " Hannes Frederic Sowa 2016-06-18 3:26 ` [net-next PATCH v3 00/17] Future-proof tunnel offload handlers David Miller 2016-06-18 3:26 ` [Intel-wired-lan] " David Miller 2016-06-20 17:05 ` Tom Herbert 2016-06-20 17:05 ` [Intel-wired-lan] " Tom Herbert 2016-06-20 18:11 ` Hannes Frederic Sowa 2016-06-20 18:11 ` [Intel-wired-lan] " Hannes Frederic Sowa 2016-06-20 19:27 ` Tom Herbert 2016-06-20 19:27 ` [Intel-wired-lan] " Tom Herbert 2016-06-20 21:36 ` Hannes Frederic Sowa 2016-06-20 21:36 ` [Intel-wired-lan] " Hannes Frederic Sowa 2016-06-20 21:45 ` Tom Herbert 2016-06-20 21:45 ` [Intel-wired-lan] " Tom Herbert 2016-06-21 8:34 ` David Miller 2016-06-21 8:34 ` [Intel-wired-lan] " David Miller 2016-06-21 8:22 ` David Miller 2016-06-21 8:22 ` [Intel-wired-lan] " David Miller 2016-06-21 10:41 ` Edward Cree 2016-06-21 10:41 ` [Intel-wired-lan] " Edward Cree 2016-06-21 15:23 ` Hannes Frederic Sowa 2016-06-21 15:23 ` [Intel-wired-lan] " Hannes Frederic Sowa 2016-06-21 17:05 ` Alexander Duyck 2016-06-21 17:05 ` [Intel-wired-lan] " Alexander Duyck 2016-06-21 17:27 ` Edward Cree 2016-06-21 17:27 ` [Intel-wired-lan] " Edward Cree 2016-06-21 17:40 ` Hannes Frederic Sowa 2016-06-21 17:40 ` [Intel-wired-lan] " Hannes Frederic Sowa 2016-06-21 18:17 ` Alexander Duyck 2016-06-21 18:17 ` [Intel-wired-lan] " Alexander Duyck 2016-06-21 18:42 ` Tom Herbert 2016-06-21 18:42 ` [Intel-wired-lan] " Tom Herbert 2016-06-21 21:34 ` Hannes Frederic Sowa 2016-06-21 21:34 ` [Intel-wired-lan] " Hannes Frederic Sowa 2016-06-21 18:23 ` Edward Cree 2016-06-21 18:23 ` [Intel-wired-lan] " Edward Cree
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20160616192044.20872.17936.stgit@localhost.localdomain \ --to=aduyck@mirantis.com \ --cc=Dept-GELinuxNICDev@qlogic.com \ --cc=alexander.duyck@gmail.com \ --cc=ariel.elior@qlogic.com \ --cc=davem@davemloft.net \ --cc=eugenia@mellanox.com \ --cc=hannes@redhat.com \ --cc=intel-wired-lan@lists.osuosl.org \ --cc=jbenc@redhat.com \ --cc=jesse@kernel.org \ --cc=michael.chan@broadcom.com \ --cc=netdev@vger.kernel.org \ --cc=saeedm@mellanox.com \ --cc=tom@herbertland.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
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.