[src/netbsd-8]: src/sys/dev/pci/ixgbe Revert the pullup of the following revi...

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

details:   https://anonhg.NetBSD.org/src/rev/f5bc3a6f0ce3
branches:  netbsd-8
changeset: 851135:f5bc3a6f0ce3
user:      martin <martin%NetBSD.org@localhost>
date:      Tue Nov 21 11:38:19 2017 +0000

description:
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.

diffstat:

 sys/dev/pci/ixgbe/ixgbe.c |  8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diffs (32 lines):

diff -r 265b335f1cf0 -r f5bc3a6f0ce3 sys/dev/pci/ixgbe/ixgbe.c
--- a/sys/dev/pci/ixgbe/ixgbe.c Tue Nov 21 11:11:20 2017 +0000
+++ b/sys/dev/pci/ixgbe/ixgbe.c Tue Nov 21 11:38:19 2017 +0000
@@ -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 @@
 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 @@
        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;