Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bf2d1df3 authored May 18, 2016 by Alexander Duyck Committed by David S. Miller May 20, 2016

intel: Add support for IPv6 IP-in-IP offload



This patch adds support for offloading IPXIP6 type packets that represent
either IPv4 or IPv6 encapsulated inside of an IPv6 outer IP header.  In
addition with this change we should also be able to support FOU
encapsulated traffic with outer IPv6 headers.

Signed-off-by: Alexander Duyck <aduyck@mirantis.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 6a553681

drivers/net/ethernet/intel/i40e/i40e_main.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -9084,6 +9084,7 @@ static int i40e_config_netdev(struct i40e_vsi *vsi)
	NETIF_F_GSO_GRE \|		NETIF_F_GSO_GRE \|
	NETIF_F_GSO_GRE_CSUM \|		NETIF_F_GSO_GRE_CSUM \|
	NETIF_F_GSO_IPXIP4 \|		NETIF_F_GSO_IPXIP4 \|
			NETIF_F_GSO_IPXIP6 \|
	NETIF_F_GSO_UDP_TUNNEL \|		NETIF_F_GSO_UDP_TUNNEL \|
	NETIF_F_GSO_UDP_TUNNEL_CSUM \|		NETIF_F_GSO_UDP_TUNNEL_CSUM \|
	NETIF_F_GSO_PARTIAL \|		NETIF_F_GSO_PARTIAL \|

drivers/net/ethernet/intel/i40e/i40e_txrx.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2285,6 +2285,7 @@ static int i40e_tso(struct sk_buff skb, u8 hdr_len, u64 *cd_type_cmd_tso_mss)
	if (skb_shinfo(skb)->gso_type & (SKB_GSO_GRE \|		if (skb_shinfo(skb)->gso_type & (SKB_GSO_GRE \|
	SKB_GSO_GRE_CSUM \|		SKB_GSO_GRE_CSUM \|
	SKB_GSO_IPXIP4 \|		SKB_GSO_IPXIP4 \|
			SKB_GSO_IPXIP6 \|
	SKB_GSO_UDP_TUNNEL \|		SKB_GSO_UDP_TUNNEL \|
	SKB_GSO_UDP_TUNNEL_CSUM)) {		SKB_GSO_UDP_TUNNEL_CSUM)) {
	if (!(skb_shinfo(skb)->gso_type & SKB_GSO_PARTIAL) &&		if (!(skb_shinfo(skb)->gso_type & SKB_GSO_PARTIAL) &&

drivers/net/ethernet/intel/i40evf/i40e_txrx.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1560,6 +1560,7 @@ static int i40e_tso(struct sk_buff skb, u8 hdr_len, u64 *cd_type_cmd_tso_mss)
	if (skb_shinfo(skb)->gso_type & (SKB_GSO_GRE \|		if (skb_shinfo(skb)->gso_type & (SKB_GSO_GRE \|
	SKB_GSO_GRE_CSUM \|		SKB_GSO_GRE_CSUM \|
	SKB_GSO_IPXIP4 \|		SKB_GSO_IPXIP4 \|
			SKB_GSO_IPXIP6 \|
	SKB_GSO_UDP_TUNNEL \|		SKB_GSO_UDP_TUNNEL \|
	SKB_GSO_UDP_TUNNEL_CSUM)) {		SKB_GSO_UDP_TUNNEL_CSUM)) {
	if (!(skb_shinfo(skb)->gso_type & SKB_GSO_PARTIAL) &&		if (!(skb_shinfo(skb)->gso_type & SKB_GSO_PARTIAL) &&

drivers/net/ethernet/intel/i40evf/i40evf_main.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2231,6 +2231,7 @@ int i40evf_process_config(struct i40evf_adapter *adapter)
	NETIF_F_GSO_GRE \|		NETIF_F_GSO_GRE \|
	NETIF_F_GSO_GRE_CSUM \|		NETIF_F_GSO_GRE_CSUM \|
	NETIF_F_GSO_IPXIP4 \|		NETIF_F_GSO_IPXIP4 \|
			NETIF_F_GSO_IPXIP6 \|
	NETIF_F_GSO_UDP_TUNNEL \|		NETIF_F_GSO_UDP_TUNNEL \|
	NETIF_F_GSO_UDP_TUNNEL_CSUM \|		NETIF_F_GSO_UDP_TUNNEL_CSUM \|
	NETIF_F_GSO_PARTIAL \|		NETIF_F_GSO_PARTIAL \|

drivers/net/ethernet/intel/igb/igb_main.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2419,6 +2419,7 @@ static int igb_probe(struct pci_dev pdev, const struct pci_device_id ent)
	#define IGB_GSO_PARTIAL_FEATURES (NETIF_F_GSO_GRE \| \		#define IGB_GSO_PARTIAL_FEATURES (NETIF_F_GSO_GRE \| \
	NETIF_F_GSO_GRE_CSUM \| \		NETIF_F_GSO_GRE_CSUM \| \
	NETIF_F_GSO_IPXIP4 \| \		NETIF_F_GSO_IPXIP4 \| \
			NETIF_F_GSO_IPXIP6 \| \
	NETIF_F_GSO_UDP_TUNNEL \| \		NETIF_F_GSO_UDP_TUNNEL \| \
	NETIF_F_GSO_UDP_TUNNEL_CSUM)		NETIF_F_GSO_UDP_TUNNEL_CSUM)