[src/trunk]: src/sys/dev/pci/ixgbe Call IFQ_SET_MAXLEN() even if TX multiqueu...

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

details:   https://anonhg.NetBSD.org/src/rev/c14eb91a8888
branches:  trunk
changeset: 821495:c14eb91a8888
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Wed Feb 08 08:13:53 2017 +0000

description:
Call IFQ_SET_MAXLEN() even if TX multiqueue is used. ALTQ uses it.

diffstat:

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

diffs (51 lines):

diff -r 3d580436c73e -r c14eb91a8888 sys/dev/pci/ixgbe/ixgbe.c
--- a/sys/dev/pci/ixgbe/ixgbe.c Wed Feb 08 04:32:43 2017 +0000
+++ b/sys/dev/pci/ixgbe/ixgbe.c Wed Feb 08 08:13:53 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.69 2017/02/08 04:05:13 msaitoh Exp $*/
+/*$NetBSD: ixgbe.c,v 1.70 2017/02/08 08:13:53 msaitoh Exp $*/
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
@@ -2998,14 +2998,10 @@
 #endif
 #ifndef IXGBE_LEGACY_TX
        ifp->if_transmit = ixgbe_mq_start;
-#else
-       IFQ_SET_MAXLEN(&ifp->if_snd, adapter->num_tx_desc - 2);
-#if 0
-       ifp->if_snd.ifq_drv_maxlen = adapter->num_tx_desc - 2;
-#endif
-       IFQ_SET_READY(&ifp->if_snd);
 #endif
        ifp->if_start = ixgbe_start;
+       IFQ_SET_MAXLEN(&ifp->if_snd, adapter->num_tx_desc - 2);
+       IFQ_SET_READY(&ifp->if_snd);
 
        if_initialize(ifp);
        ether_ifattach(ifp, adapter->hw.mac.addr);
diff -r 3d580436c73e -r c14eb91a8888 sys/dev/pci/ixgbe/ixv.c
--- a/sys/dev/pci/ixgbe/ixv.c   Wed Feb 08 04:32:43 2017 +0000
+++ b/sys/dev/pci/ixgbe/ixv.c   Wed Feb 08 08:13:53 2017 +0000
@@ -31,7 +31,7 @@
 
 ******************************************************************************/
 /*$FreeBSD: head/sys/dev/ixgbe/if_ixv.c 302384 2016-07-07 03:39:18Z sbruno $*/
-/*$NetBSD: ixv.c,v 1.44 2017/02/08 04:28:53 msaitoh Exp $*/
+/*$NetBSD: ixv.c,v 1.45 2017/02/08 08:13:53 msaitoh Exp $*/
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
@@ -1652,7 +1652,8 @@
        ifp->if_transmit = ixgbe_mq_start;
 #endif
        ifp->if_start = ixgbe_start;
-       ifp->if_snd.ifq_maxlen = adapter->num_tx_desc - 2;
+       IFQ_SET_MAXLEN(&ifp->if_snd, adapter->num_tx_desc - 2);
+       IFQ_SET_READY(&ifp->if_snd);
 
        if_initialize(ifp);
        ether_ifattach(ifp, adapter->hw.mac.addr);