Re: [PATCH v5 net-next 02/14] net: define gso types for IPx over IPv4 and IPv6

2016-05-16 Thread Alexander Duyck 
On Mon, May 16, 2016 at 11:28 AM, Tom Herbert  wrote:
> On Mon, May 16, 2016 at 11:13 AM, Alexander Duyck
>  wrote:
>> On Mon, May 16, 2016 at 11:07 AM, Tom Herbert  wrote:
>>> On Mon, May 16, 2016 at 9:32 AM, Alexander Duyck
>>>  wrote:
 On Sun, May 15, 2016 at 4:42 PM, Tom Herbert  wrote:
> 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: Tom Herbert 
> ---
>  drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c  |  5 ++---
>  drivers/net/ethernet/broadcom/bnxt/bnxt.c |  4 ++--
>  drivers/net/ethernet/intel/i40e/i40e_main.c   |  3 +--
>  drivers/net/ethernet/intel/i40e/i40e_txrx.c   |  3 +--
>  drivers/net/ethernet/intel/i40evf/i40e_txrx.c |  3 +--
>  drivers/net/ethernet/intel/i40evf/i40evf_main.c   |  3 +--
>  drivers/net/ethernet/intel/igb/igb_main.c |  3 +--
>  drivers/net/ethernet/intel/ixgbe/ixgbe_main.c |  3 +--
>  drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c |  3 +--
>  include/linux/netdev_features.h   | 12 ++--
>  include/linux/netdevice.h |  4 ++--
>  include/linux/skbuff.h|  4 ++--
>  net/core/ethtool.c|  4 ++--
>  net/ipv4/af_inet.c|  2 +-
>  net/ipv4/ipip.c   |  2 +-
>  net/ipv6/ip6_offload.c|  4 ++--
>  net/ipv6/sit.c|  4 ++--
>  net/netfilter/ipvs/ip_vs_xmit.c   | 17 +++--
>  18 files changed, 36 insertions(+), 47 deletions(-)

 It looks like you missed drivers/net/ethernet/intel/igb/netdev.c.  If
 you don't get it then it will break the build.

>>>
>>> I don't see file that in betdev branch, maybe it's new?
>>
>> Nope, it has been there for a while.  It got patched to support IPIP
>> and SIT tunnels in the same patch that updated igb/igb_main.c.
>>
>
> Looks like it's
>
> drivers/net/ethernet/intel/igbvf/netdev.c
>
>> I am also looking into the other patches now.  It looks like something
>> broke hardware offloads again as I am only getting .9 Mb/s for IPv6
>> based GRE tunnels with your patches applied.  I'm trying to bisect it
>> now.
>>
> What hardware are you using?

I'm using an Intel X710, it is an i40e based NIC.

- Alex

Re: [PATCH v5 net-next 02/14] net: define gso types for IPx over IPv4 and IPv6

2016-05-16 Thread Tom Herbert 
On Mon, May 16, 2016 at 11:13 AM, Alexander Duyck
 wrote:
> On Mon, May 16, 2016 at 11:07 AM, Tom Herbert  wrote:
>> On Mon, May 16, 2016 at 9:32 AM, Alexander Duyck
>>  wrote:
>>> On Sun, May 15, 2016 at 4:42 PM, Tom Herbert  wrote:
 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: Tom Herbert 
 ---
  drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c  |  5 ++---
  drivers/net/ethernet/broadcom/bnxt/bnxt.c |  4 ++--
  drivers/net/ethernet/intel/i40e/i40e_main.c   |  3 +--
  drivers/net/ethernet/intel/i40e/i40e_txrx.c   |  3 +--
  drivers/net/ethernet/intel/i40evf/i40e_txrx.c |  3 +--
  drivers/net/ethernet/intel/i40evf/i40evf_main.c   |  3 +--
  drivers/net/ethernet/intel/igb/igb_main.c |  3 +--
  drivers/net/ethernet/intel/ixgbe/ixgbe_main.c |  3 +--
  drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c |  3 +--
  include/linux/netdev_features.h   | 12 ++--
  include/linux/netdevice.h |  4 ++--
  include/linux/skbuff.h|  4 ++--
  net/core/ethtool.c|  4 ++--
  net/ipv4/af_inet.c|  2 +-
  net/ipv4/ipip.c   |  2 +-
  net/ipv6/ip6_offload.c|  4 ++--
  net/ipv6/sit.c|  4 ++--
  net/netfilter/ipvs/ip_vs_xmit.c   | 17 +++--
  18 files changed, 36 insertions(+), 47 deletions(-)
>>>
>>> It looks like you missed drivers/net/ethernet/intel/igb/netdev.c.  If
>>> you don't get it then it will break the build.
>>>
>>
>> I don't see file that in betdev branch, maybe it's new?
>
> Nope, it has been there for a while.  It got patched to support IPIP
> and SIT tunnels in the same patch that updated igb/igb_main.c.
>

Looks like it's

drivers/net/ethernet/intel/igbvf/netdev.c

> I am also looking into the other patches now.  It looks like something
> broke hardware offloads again as I am only getting .9 Mb/s for IPv6
> based GRE tunnels with your patches applied.  I'm trying to bisect it
> now.
>
What hardware are you using?

Tom

> - Alex

Re: [PATCH v5 net-next 02/14] net: define gso types for IPx over IPv4 and IPv6

2016-05-16 Thread Alexander Duyck 
On Mon, May 16, 2016 at 11:07 AM, Tom Herbert  wrote:
> On Mon, May 16, 2016 at 9:32 AM, Alexander Duyck
>  wrote:
>> On Sun, May 15, 2016 at 4:42 PM, Tom Herbert  wrote:
>>> 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: Tom Herbert 
>>> ---
>>>  drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c  |  5 ++---
>>>  drivers/net/ethernet/broadcom/bnxt/bnxt.c |  4 ++--
>>>  drivers/net/ethernet/intel/i40e/i40e_main.c   |  3 +--
>>>  drivers/net/ethernet/intel/i40e/i40e_txrx.c   |  3 +--
>>>  drivers/net/ethernet/intel/i40evf/i40e_txrx.c |  3 +--
>>>  drivers/net/ethernet/intel/i40evf/i40evf_main.c   |  3 +--
>>>  drivers/net/ethernet/intel/igb/igb_main.c |  3 +--
>>>  drivers/net/ethernet/intel/ixgbe/ixgbe_main.c |  3 +--
>>>  drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c |  3 +--
>>>  include/linux/netdev_features.h   | 12 ++--
>>>  include/linux/netdevice.h |  4 ++--
>>>  include/linux/skbuff.h|  4 ++--
>>>  net/core/ethtool.c|  4 ++--
>>>  net/ipv4/af_inet.c|  2 +-
>>>  net/ipv4/ipip.c   |  2 +-
>>>  net/ipv6/ip6_offload.c|  4 ++--
>>>  net/ipv6/sit.c|  4 ++--
>>>  net/netfilter/ipvs/ip_vs_xmit.c   | 17 +++--
>>>  18 files changed, 36 insertions(+), 47 deletions(-)
>>
>> It looks like you missed drivers/net/ethernet/intel/igb/netdev.c.  If
>> you don't get it then it will break the build.
>>
>
> I don't see file that in betdev branch, maybe it's new?

Nope, it has been there for a while.  It got patched to support IPIP
and SIT tunnels in the same patch that updated igb/igb_main.c.

I am also looking into the other patches now.  It looks like something
broke hardware offloads again as I am only getting .9 Mb/s for IPv6
based GRE tunnels with your patches applied.  I'm trying to bisect it
now.

- Alex

Re: [PATCH v5 net-next 02/14] net: define gso types for IPx over IPv4 and IPv6

2016-05-16 Thread Tom Herbert 
On Mon, May 16, 2016 at 9:32 AM, Alexander Duyck
 wrote:
> On Sun, May 15, 2016 at 4:42 PM, Tom Herbert  wrote:
>> 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: Tom Herbert 
>> ---
>>  drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c  |  5 ++---
>>  drivers/net/ethernet/broadcom/bnxt/bnxt.c |  4 ++--
>>  drivers/net/ethernet/intel/i40e/i40e_main.c   |  3 +--
>>  drivers/net/ethernet/intel/i40e/i40e_txrx.c   |  3 +--
>>  drivers/net/ethernet/intel/i40evf/i40e_txrx.c |  3 +--
>>  drivers/net/ethernet/intel/i40evf/i40evf_main.c   |  3 +--
>>  drivers/net/ethernet/intel/igb/igb_main.c |  3 +--
>>  drivers/net/ethernet/intel/ixgbe/ixgbe_main.c |  3 +--
>>  drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c |  3 +--
>>  include/linux/netdev_features.h   | 12 ++--
>>  include/linux/netdevice.h |  4 ++--
>>  include/linux/skbuff.h|  4 ++--
>>  net/core/ethtool.c|  4 ++--
>>  net/ipv4/af_inet.c|  2 +-
>>  net/ipv4/ipip.c   |  2 +-
>>  net/ipv6/ip6_offload.c|  4 ++--
>>  net/ipv6/sit.c|  4 ++--
>>  net/netfilter/ipvs/ip_vs_xmit.c   | 17 +++--
>>  18 files changed, 36 insertions(+), 47 deletions(-)
>
> It looks like you missed drivers/net/ethernet/intel/igb/netdev.c.  If
> you don't get it then it will break the build.
>

I don't see file that in betdev branch, maybe it's new?

Tom

> Thanks.
>
> - Alex

Re: [PATCH v5 net-next 02/14] net: define gso types for IPx over IPv4 and IPv6

2016-05-16 Thread Alexander Duyck 
On Sun, May 15, 2016 at 4:42 PM, Tom Herbert  wrote:
> 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: Tom Herbert 
> ---
>  drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c  |  5 ++---
>  drivers/net/ethernet/broadcom/bnxt/bnxt.c |  4 ++--
>  drivers/net/ethernet/intel/i40e/i40e_main.c   |  3 +--
>  drivers/net/ethernet/intel/i40e/i40e_txrx.c   |  3 +--
>  drivers/net/ethernet/intel/i40evf/i40e_txrx.c |  3 +--
>  drivers/net/ethernet/intel/i40evf/i40evf_main.c   |  3 +--
>  drivers/net/ethernet/intel/igb/igb_main.c |  3 +--
>  drivers/net/ethernet/intel/ixgbe/ixgbe_main.c |  3 +--
>  drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c |  3 +--
>  include/linux/netdev_features.h   | 12 ++--
>  include/linux/netdevice.h |  4 ++--
>  include/linux/skbuff.h|  4 ++--
>  net/core/ethtool.c|  4 ++--
>  net/ipv4/af_inet.c|  2 +-
>  net/ipv4/ipip.c   |  2 +-
>  net/ipv6/ip6_offload.c|  4 ++--
>  net/ipv6/sit.c|  4 ++--
>  net/netfilter/ipvs/ip_vs_xmit.c   | 17 +++--
>  18 files changed, 36 insertions(+), 47 deletions(-)
>

<...>

> diff --git a/drivers/net/ethernet/intel/igb/igb_main.c 
> b/drivers/net/ethernet/intel/igb/igb_main.c
> index 2172769..808d48f 100644
> --- a/drivers/net/ethernet/intel/igb/igb_main.c
> +++ b/drivers/net/ethernet/intel/igb/igb_main.c
> @@ -2418,8 +2418,7 @@ static int igb_probe(struct pci_dev *pdev, const struct 
> pci_device_id *ent)
>
>  #define IGB_GSO_PARTIAL_FEATURES (NETIF_F_GSO_GRE | \
>   NETIF_F_GSO_GRE_CSUM | \
> - NETIF_F_GSO_IPIP | \
> - NETIF_F_GSO_SIT | \
> + SKB_GSO_IPXIP4 | \
>   NETIF_F_GSO_UDP_TUNNEL | \
>   NETIF_F_GSO_UDP_TUNNEL_CSUM)
>

Sorry but this is yet another bug.  It should be NETIF_F_GSO_IPXIP4,
not SKB_GSO_IPXIP4.

So we are up to at least 3 items that need to be addressed in this patch.

1.  igbvf/netdev.c also has a reference to NETIF_F_GSO_IPIP/NETIF_F_GSO_SIT.
2.  bnxt needs a '|' instead of a ';' to avoid statement with no effect.
3.  Use of SKB_GSO_IPXIP4 in igb/igb_main.c which should have been
NETIF_F_GSO_IPXIP4.

I think that is everything for this patch.  I'll be certain once I can
do some performance testing to determine if the hardware offloads for
the Intel parts are working correctly.

Thanks.

- Alex

Re: [PATCH v5 net-next 02/14] net: define gso types for IPx over IPv4 and IPv6

2016-05-16 Thread Alexander Duyck 
On Sun, May 15, 2016 at 4:42 PM, Tom Herbert  wrote:
> 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: Tom Herbert 
> ---
>  drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c  |  5 ++---
>  drivers/net/ethernet/broadcom/bnxt/bnxt.c |  4 ++--
>  drivers/net/ethernet/intel/i40e/i40e_main.c   |  3 +--
>  drivers/net/ethernet/intel/i40e/i40e_txrx.c   |  3 +--
>  drivers/net/ethernet/intel/i40evf/i40e_txrx.c |  3 +--
>  drivers/net/ethernet/intel/i40evf/i40evf_main.c   |  3 +--
>  drivers/net/ethernet/intel/igb/igb_main.c |  3 +--
>  drivers/net/ethernet/intel/ixgbe/ixgbe_main.c |  3 +--
>  drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c |  3 +--
>  include/linux/netdev_features.h   | 12 ++--
>  include/linux/netdevice.h |  4 ++--
>  include/linux/skbuff.h|  4 ++--
>  net/core/ethtool.c|  4 ++--
>  net/ipv4/af_inet.c|  2 +-
>  net/ipv4/ipip.c   |  2 +-
>  net/ipv6/ip6_offload.c|  4 ++--
>  net/ipv6/sit.c|  4 ++--
>  net/netfilter/ipvs/ip_vs_xmit.c   | 17 +++--
>  18 files changed, 36 insertions(+), 47 deletions(-)
>

<...>

> diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c 
> b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
> index 5a0dca3..bfc1e94 100644
> --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
> +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
> @@ -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,7 +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_IPXIP4;
> NETIF_F_GSO_PARTIAL;
> dev->gso_partial_features = NETIF_F_GSO_UDP_TUNNEL_CSUM |
> NETIF_F_GSO_GRE_CSUM;

This bit here is breaking the build as well.  It should be a '|'
following the IPXIP4, not a ';'.  As it currently is it is generating
the following error:

drivers/net/ethernet/broadcom/bnxt/bnxt.c: In function ‘bnxt_init_one’:
include/linux/netdev_features.h:88:28: warning: statement with no
effect [-Wunused-value]
 #define __NETIF_F_BIT(bit) ((netdev_features_t)1 << (bit))
^
include/linux/netdev_features.h:89:26: note: in expansion of macro
‘__NETIF_F_BIT’
 #define __NETIF_F(name)  __NETIF_F_BIT(NETIF_F_##name##_BIT)
  ^
include/linux/netdev_features.h:129:30: note: in expansion of macro ‘__NETIF_F’
 #define NETIF_F_GSO_PARTIAL  __NETIF_F(GSO_PARTIAL)
  ^
drivers/net/ethernet/broadcom/bnxt/bnxt.c:6325:4: note: in expansion
of macro ‘NETIF_F_GSO_PARTIAL’
NETIF_F_GSO_PARTIAL;
^

- Alex

Re: [PATCH v5 net-next 02/14] net: define gso types for IPx over IPv4 and IPv6

2016-05-16 Thread Alexander Duyck 
On Sun, May 15, 2016 at 4:42 PM, Tom Herbert  wrote:
> 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: Tom Herbert 
> ---
>  drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c  |  5 ++---
>  drivers/net/ethernet/broadcom/bnxt/bnxt.c |  4 ++--
>  drivers/net/ethernet/intel/i40e/i40e_main.c   |  3 +--
>  drivers/net/ethernet/intel/i40e/i40e_txrx.c   |  3 +--
>  drivers/net/ethernet/intel/i40evf/i40e_txrx.c |  3 +--
>  drivers/net/ethernet/intel/i40evf/i40evf_main.c   |  3 +--
>  drivers/net/ethernet/intel/igb/igb_main.c |  3 +--
>  drivers/net/ethernet/intel/ixgbe/ixgbe_main.c |  3 +--
>  drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c |  3 +--
>  include/linux/netdev_features.h   | 12 ++--
>  include/linux/netdevice.h |  4 ++--
>  include/linux/skbuff.h|  4 ++--
>  net/core/ethtool.c|  4 ++--
>  net/ipv4/af_inet.c|  2 +-
>  net/ipv4/ipip.c   |  2 +-
>  net/ipv6/ip6_offload.c|  4 ++--
>  net/ipv6/sit.c|  4 ++--
>  net/netfilter/ipvs/ip_vs_xmit.c   | 17 +++--
>  18 files changed, 36 insertions(+), 47 deletions(-)

It looks like you missed drivers/net/ethernet/intel/igb/netdev.c.  If
you don't get it then it will break the build.

Thanks.

- Alex

Re: [PATCH v5 net-next 02/14] net: define gso types for IPx over IPv4 and IPv6

2016-05-15 Thread Jeff Kirsher 
On Sun, 2016-05-15 at 16:42 -0700, Tom Herbert wrote:
> 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: Tom Herbert 

Acked-by: Jeff Kirsher 
For the Intel driver changes...

> ---
>  drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c  |  5 ++---
>  drivers/net/ethernet/broadcom/bnxt/bnxt.c |  4 ++--
>  drivers/net/ethernet/intel/i40e/i40e_main.c   |  3 +--
>  drivers/net/ethernet/intel/i40e/i40e_txrx.c   |  3 +--
>  drivers/net/ethernet/intel/i40evf/i40e_txrx.c |  3 +--
>  drivers/net/ethernet/intel/i40evf/i40evf_main.c   |  3 +--
>  drivers/net/ethernet/intel/igb/igb_main.c |  3 +--
>  drivers/net/ethernet/intel/ixgbe/ixgbe_main.c |  3 +--
>  drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c |  3 +--
>  include/linux/netdev_features.h   | 12 ++--
>  include/linux/netdevice.h |  4 ++--
>  include/linux/skbuff.h    |  4 ++--
>  net/core/ethtool.c    |  4 ++--
>  net/ipv4/af_inet.c    |  2 +-
>  net/ipv4/ipip.c   |  2 +-
>  net/ipv6/ip6_offload.c    |  4 ++--
>  net/ipv6/sit.c    |  4 ++--
>  net/netfilter/ipvs/ip_vs_xmit.c   | 17 +++--
>  18 files changed, 36 insertions(+), 47 deletions(-)


signature.asc
Description: This is a digitally signed message part