Module Name: src
Committed By: martin
Date: Thu Nov 8 12:04:49 UTC 2018
Modified Files:
src/sys/dev/pci/ixgbe [netbsd-8]: ixgbe.c ixv.c
Log Message:
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).
To generate a diff of this commit:
cvs rdiff -u -r1.88.2.24 -r1.88.2.25 src/sys/dev/pci/ixgbe/ixgbe.c
cvs rdiff -u -r1.56.2.17 -r1.56.2.18 src/sys/dev/pci/ixgbe/ixv.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/ixgbe/ixgbe.c
diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.88.2.24 src/sys/dev/pci/ixgbe/ixgbe.c:1.88.2.25
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.88.2.24 Sun Sep 23 17:43:36 2018
+++ src/sys/dev/pci/ixgbe/ixgbe.c Thu Nov 8 12:04:48 2018
@@ -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 @@ ixgbe_setup_interface(device_t dev, stru
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
Index: src/sys/dev/pci/ixgbe/ixv.c
diff -u src/sys/dev/pci/ixgbe/ixv.c:1.56.2.17 src/sys/dev/pci/ixgbe/ixv.c:1.56.2.18
--- src/sys/dev/pci/ixgbe/ixv.c:1.56.2.17 Sat Jun 9 14:59:43 2018
+++ src/sys/dev/pci/ixgbe/ixv.c Thu Nov 8 12:04:48 2018
@@ -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 @@ ixv_setup_interface(device_t dev, struct
ec->ec_capenable = ec->ec_capabilities;
/* Don't enable LRO by default */
- ifp->if_capabilities |= IFCAP_LRO;
#if 0
- ifp->if_capenable = ifp->if_capabilities;
+ /* NetBSD doesn't support LRO yet */
+ ifp->if_capabilities |= IFCAP_LRO;
#endif
/*
