Module Name: src
Committed By: martin
Date: Tue Nov 21 11:38:19 UTC 2017
Modified Files:
src/sys/dev/pci/ixgbe [netbsd-8]: ixgbe.c
Log Message:
Revert the pullup of the following revision(s) (requested by msaitoh in ticket
#361):
sys/dev/pci/ixgbe/ixgbe.c: revision 1.97
Revert a part of ticket #248 because it panics when attaching.
It is hard to fix with a small change.
To generate a diff of this commit:
cvs rdiff -u -r1.88.2.3 -r1.88.2.4 src/sys/dev/pci/ixgbe/ixgbe.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.3 src/sys/dev/pci/ixgbe/ixgbe.c:1.88.2.4
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.88.2.3 Thu Aug 31 11:37:37 2017
+++ src/sys/dev/pci/ixgbe/ixgbe.c Tue Nov 21 11:38:19 2017
@@ -59,7 +59,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
/*$FreeBSD: head/sys/dev/ixgbe/if_ix.c 302384 2016-07-07 03:39:18Z sbruno $*/
-/*$NetBSD: ixgbe.c,v 1.88.2.3 2017/08/31 11:37:37 martin Exp $*/
+/*$NetBSD: ixgbe.c,v 1.88.2.4 2017/11/21 11:38:19 martin Exp $*/
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -2960,7 +2960,6 @@ static int
ixgbe_setup_msix(struct adapter *adapter)
{
device_t dev = adapter->dev;
- struct ixgbe_mac_info *mac = &adapter->hw.mac;
int want, queues, msgs;
/* Override by tuneable */
@@ -2987,9 +2986,8 @@ ixgbe_setup_msix(struct adapter *adapter
if (ixgbe_num_queues != 0)
queues = ixgbe_num_queues;
/* Set max queues to 8 when autoconfiguring */
- else
- queues = min(queues,
- min(mac->max_tx_queues, mac->max_rx_queues));
+ else if ((ixgbe_num_queues == 0) && (queues > 8))
+ queues = 8;
/* reflect correct sysctl value */
ixgbe_num_queues = queues;
