Module Name: src
Committed By: msaitoh
Date: Wed Feb 8 08:13:53 UTC 2017
Modified Files:
src/sys/dev/pci/ixgbe: ixgbe.c ixv.c
Log Message:
Call IFQ_SET_MAXLEN() even if TX multiqueue is used. ALTQ uses it.
To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 src/sys/dev/pci/ixgbe/ixgbe.c
cvs rdiff -u -r1.44 -r1.45 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.69 src/sys/dev/pci/ixgbe/ixgbe.c:1.70
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.69 Wed Feb 8 04:05:13 2017
+++ src/sys/dev/pci/ixgbe/ixgbe.c Wed Feb 8 08:13:53 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.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 @@ ixgbe_setup_interface(device_t dev, stru
#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);
Index: src/sys/dev/pci/ixgbe/ixv.c
diff -u src/sys/dev/pci/ixgbe/ixv.c:1.44 src/sys/dev/pci/ixgbe/ixv.c:1.45
--- src/sys/dev/pci/ixgbe/ixv.c:1.44 Wed Feb 8 04:28:53 2017
+++ src/sys/dev/pci/ixgbe/ixv.c Wed Feb 8 08:13:53 2017
@@ -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 @@ ixv_setup_interface(device_t dev, struct
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);
