[src/netbsd-8]: src/sys/dev/pci/ixgbe Pull up following revision(s) (requeste...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4bdd2c34b4df
branches:  netbsd-8
changeset: 852098:4bdd2c34b4df
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Nov 08 12:04:48 2018 +0000

description:
Pull up following revision(s) (requested by msaitoh in ticket #1084):

        sys/dev/pci/ixgbe/ixv.c: revision 1.107
        sys/dev/pci/ixgbe/ixgbe.c: revision 1.167

  Don't set LRO capability flag because we don't support it yet.

This doesn't change any behavior other than if_capabilities' visibility
(e.g. ifconfig).

diffstat:

 sys/dev/pci/ixgbe/ixgbe.c |  5 ++---
 sys/dev/pci/ixgbe/ixv.c   |  6 +++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diffs (40 lines):

diff -r 9b1178bdbef7 -r 4bdd2c34b4df sys/dev/pci/ixgbe/ixgbe.c
--- a/sys/dev/pci/ixgbe/ixgbe.c Wed Nov 07 09:13:44 2018 +0000
+++ b/sys/dev/pci/ixgbe/ixgbe.c Thu Nov 08 12:04:48 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.c,v 1.88.2.24 2018/09/23 17:43:36 martin Exp $ */
+/* $NetBSD: ixgbe.c,v 1.88.2.25 2018/11/08 12:04:48 martin Exp $ */
 
 /******************************************************************************
 
@@ -1312,8 +1312,7 @@
        ifp->if_capabilities |= IFCAP_RXCSUM
                             |  IFCAP_TXCSUM
                             |  IFCAP_TSOv4
-                            |  IFCAP_TSOv6
-                            |  IFCAP_LRO;
+                            |  IFCAP_TSOv6;
        ifp->if_capenable = 0;
 
        ec->ec_capabilities |= ETHERCAP_VLAN_HWTAGGING
diff -r 9b1178bdbef7 -r 4bdd2c34b4df sys/dev/pci/ixgbe/ixv.c
--- a/sys/dev/pci/ixgbe/ixv.c   Wed Nov 07 09:13:44 2018 +0000
+++ b/sys/dev/pci/ixgbe/ixv.c   Thu Nov 08 12:04:48 2018 +0000
@@ -1,4 +1,4 @@
-/*$NetBSD: ixv.c,v 1.56.2.17 2018/06/09 14:59:43 martin Exp $*/
+/*$NetBSD: ixv.c,v 1.56.2.18 2018/11/08 12:04:48 martin Exp $*/
 
 /******************************************************************************
 
@@ -1554,9 +1554,9 @@
        ec->ec_capenable = ec->ec_capabilities;
 
        /* Don't enable LRO by default */
+#if 0
+       /* NetBSD doesn't support LRO yet */
        ifp->if_capabilities |= IFCAP_LRO;
-#if 0
-       ifp->if_capenable = ifp->if_capabilities;
 #endif
 
        /*