[src/trunk]: src/sys/dev/pci/ixgbe Do if_snd check even if IXGBE_LEGACY_TX is...

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

details:   https://anonhg.NetBSD.org/src/rev/9472525c3700
branches:  trunk
changeset: 351491:9472525c3700
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Thu Feb 16 08:01:11 2017 +0000

description:
Do if_snd check even if IXGBE_LEGACY_TX is used. It's used by ALTQ.

diffstat:

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

diffs (54 lines):

diff -r 4bf00e66ad39 -r 9472525c3700 sys/dev/pci/ixgbe/ixgbe.c
--- a/sys/dev/pci/ixgbe/ixgbe.c Thu Feb 16 07:58:21 2017 +0000
+++ b/sys/dev/pci/ixgbe/ixgbe.c Thu Feb 16 08:01:11 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.77 2017/02/16 07:58:21 msaitoh Exp $*/
+/*$NetBSD: ixgbe.c,v 1.78 2017/02/16 08:01:11 msaitoh Exp $*/
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
@@ -1572,10 +1572,11 @@
 #ifndef IXGBE_LEGACY_TX
                if (pcq_peek(txr->txr_interq) != NULL)
                        ixgbe_mq_start_locked(ifp, txr);
-#else
-               if (!IFQ_IS_EMPTY(&ifp->if_snd))
+#endif
+               /* Only for queue 0 */
+               if ((&adapter->queues[0] == que)
+                   && (!IFQ_IS_EMPTY(&ifp->if_snd)))
                        ixgbe_start_locked(txr, ifp);
-#endif
                IXGBE_TX_UNLOCK(txr);
        }
 
diff -r 4bf00e66ad39 -r 9472525c3700 sys/dev/pci/ixgbe/ixv.c
--- a/sys/dev/pci/ixgbe/ixv.c   Thu Feb 16 07:58:21 2017 +0000
+++ b/sys/dev/pci/ixgbe/ixv.c   Thu Feb 16 08:01:11 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.53 2017/02/13 10:37:37 msaitoh Exp $*/
+/*$NetBSD: ixv.c,v 1.54 2017/02/16 08:01:11 msaitoh Exp $*/
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
@@ -886,10 +886,11 @@
 #ifndef IXGBE_LEGACY_TX
                if (pcq_peek(txr->txr_interq) != NULL)
                        ixgbe_mq_start_locked(ifp, txr);
-#else
-               if (!IFQ_IS_EMPTY(&ifp->if_snd))
+#endif
+               /* Only for queue 0 */
+               if ((&adapter->queues[0] == que)
+                   && (!IFQ_IS_EMPTY(&ifp->if_snd)))
                        ixgbe_start_locked(txr, ifp);
-#endif
                IXGBE_TX_UNLOCK(txr);
                if (more) {
                        adapter->req.ev_count++;