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

Commit 7e13318d authored by Tom Herbert's avatar Tom Herbert Committed by David S. Miller
Browse files

net: define gso types for IPx over IPv4 and IPv6 



This patch defines two new GSO definitions SKB_GSO_IPXIP4 and
SKB_GSO_IPXIP6 along with corresponding NETIF_F_GSO_IPXIP4 and
NETIF_F_GSO_IPXIP6. These are used to described IP in IP
tunnel and what the outer protocol is. The inner protocol
can be deduced from other GSO types (e.g. SKB_GSO_TCPV4 and
SKB_GSO_TCPV6). The GSO types of SKB_GSO_IPIP and SKB_GSO_SIT
are removed (these are both instances of SKB_GSO_IPXIP4).
SKB_GSO_IPXIP6 will be used when support for GSO with IP
encapsulation over IPv6 is added.

Signed-off-by: default avatarTom Herbert <tom@herbertland.com>
Acked-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5c7cdf33

drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c

+2 −3
Original line number Diff line number Diff line
@@ -13259,12 +13259,11 @@ static int bnx2x_init_dev(struct bnx2x *bp, struct pci_dev *pdev, 
		NETIF_F_RXHASH | NETIF_F_HW_VLAN_CTAG_TX;

	if (!chip_is_e1x) {

		dev->hw_features |= NETIF_F_GSO_GRE | NETIF_F_GSO_UDP_TUNNEL |

				    NETIF_F_GSO_IPIP | NETIF_F_GSO_SIT;

				    NETIF_F_GSO_IPXIP4;

		dev->hw_enc_features =

			NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM | NETIF_F_SG |

			NETIF_F_TSO | NETIF_F_TSO_ECN | NETIF_F_TSO6 |

			NETIF_F_GSO_IPIP |

			NETIF_F_GSO_SIT |

			NETIF_F_GSO_IPXIP4 |

			NETIF_F_GSO_GRE | NETIF_F_GSO_UDP_TUNNEL;

	}

drivers/net/ethernet/broadcom/bnxt/bnxt.c

+2 −3
Original line number Diff line number Diff line
@@ -6311,7 +6311,7 @@ static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
	dev->hw_features = NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM | NETIF_F_SG |

			   NETIF_F_TSO | NETIF_F_TSO6 |

			   NETIF_F_GSO_UDP_TUNNEL | NETIF_F_GSO_GRE |

			   NETIF_F_GSO_IPIP | NETIF_F_GSO_SIT |

			   NETIF_F_GSO_IPXIP4 |

			   NETIF_F_GSO_UDP_TUNNEL_CSUM | NETIF_F_GSO_GRE_CSUM |

			   NETIF_F_GSO_PARTIAL | NETIF_F_RXHASH |

			   NETIF_F_RXCSUM | NETIF_F_LRO | NETIF_F_GRO;
@@ -6321,8 +6321,7 @@ static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
			NETIF_F_TSO | NETIF_F_TSO6 |

			NETIF_F_GSO_UDP_TUNNEL | NETIF_F_GSO_GRE |

			NETIF_F_GSO_UDP_TUNNEL_CSUM | NETIF_F_GSO_GRE_CSUM |

			NETIF_F_GSO_IPIP | NETIF_F_GSO_SIT |

			NETIF_F_GSO_PARTIAL;

			NETIF_F_GSO_IPXIP4 | NETIF_F_GSO_PARTIAL;

	dev->gso_partial_features = NETIF_F_GSO_UDP_TUNNEL_CSUM |

				    NETIF_F_GSO_GRE_CSUM;

	dev->vlan_features = dev->hw_features | NETIF_F_HIGHDMA;

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

+1 −2
Original line number Diff line number Diff line
@@ -9083,8 +9083,7 @@ static int i40e_config_netdev(struct i40e_vsi *vsi) 
				   NETIF_F_TSO6			|

				   NETIF_F_GSO_GRE		|

				   NETIF_F_GSO_GRE_CSUM		|

				   NETIF_F_GSO_IPIP		|

				   NETIF_F_GSO_SIT		|

				   NETIF_F_GSO_IPXIP4		|

				   NETIF_F_GSO_UDP_TUNNEL	|

				   NETIF_F_GSO_UDP_TUNNEL_CSUM	|

				   NETIF_F_GSO_PARTIAL		|

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

+1 −2
Original line number Diff line number Diff line
@@ -2284,8 +2284,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 |

					 SKB_GSO_GRE_CSUM |

					 SKB_GSO_IPIP |

					 SKB_GSO_SIT |

					 SKB_GSO_IPXIP4 |

					 SKB_GSO_UDP_TUNNEL |

					 SKB_GSO_UDP_TUNNEL_CSUM)) {

		if (!(skb_shinfo(skb)->gso_type & SKB_GSO_PARTIAL) &&

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

+1 −2
Original line number Diff line number Diff line
@@ -1559,8 +1559,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 |

					 SKB_GSO_GRE_CSUM |

					 SKB_GSO_IPIP |

					 SKB_GSO_SIT |

					 SKB_GSO_IPXIP4 |

					 SKB_GSO_UDP_TUNNEL |

					 SKB_GSO_UDP_TUNNEL_CSUM)) {

		if (!(skb_shinfo(skb)->gso_type & SKB_GSO_PARTIAL) &&