[src/trunk]: src/sys/dev/pci/ixgbe - Count tso_err again. It was accidentally...

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

details:   https://anonhg.NetBSD.org/src/rev/8402e8016f53
branches:  trunk
changeset: 350999:8402e8016f53
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Mon Jan 30 05:02:43 2017 +0000

description:
- Count tso_err again. It was accidentally removed in ixgbe.c rev. 1.28.
- ixgbe.h: Sort entries to reduce diff against FreeBSD.

diffstat:

 sys/dev/pci/ixgbe/ix_txrx.c |  12 +++++++++---
 sys/dev/pci/ixgbe/ixgbe.h   |   4 ++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diffs (51 lines):

diff -r 31a1e02b0159 -r 8402e8016f53 sys/dev/pci/ixgbe/ix_txrx.c
--- a/sys/dev/pci/ixgbe/ix_txrx.c       Mon Jan 30 02:46:20 2017 +0000
+++ b/sys/dev/pci/ixgbe/ix_txrx.c       Mon Jan 30 05:02:43 2017 +0000
@@ -59,7 +59,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*$FreeBSD: head/sys/dev/ixgbe/ix_txrx.c 301538 2016-06-07 04:51:50Z sephe $*/
-/*$NetBSD: ix_txrx.c,v 1.16 2017/01/19 06:56:33 msaitoh Exp $*/
+/*$NetBSD: ix_txrx.c,v 1.17 2017/01/30 05:02:43 msaitoh Exp $*/
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
@@ -770,8 +770,14 @@
 
 
        /* First check if TSO is to be used */
-       if (mp->m_pkthdr.csum_flags & (M_CSUM_TSOv4|M_CSUM_TSOv6))
-               return (ixgbe_tso_setup(txr, mp, cmd_type_len, olinfo_status));
+       if (mp->m_pkthdr.csum_flags & (M_CSUM_TSOv4|M_CSUM_TSOv6)) {
+               int rv = ixgbe_tso_setup(txr, mp, cmd_type_len, olinfo_status);
+
+               if (rv != 0) {
+                       ++adapter->tso_err.ev_count;
+                       return rv;
+               }
+       }
 
        if ((mp->m_pkthdr.csum_flags & M_CSUM_OFFLOAD) == 0)
                offload = FALSE;
diff -r 31a1e02b0159 -r 8402e8016f53 sys/dev/pci/ixgbe/ixgbe.h
--- a/sys/dev/pci/ixgbe/ixgbe.h Mon Jan 30 02:46:20 2017 +0000
+++ b/sys/dev/pci/ixgbe/ixgbe.h Mon Jan 30 05:02:43 2017 +0000
@@ -59,7 +59,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*$FreeBSD: head/sys/dev/ixgbe/ixgbe.h 303890 2016-08-09 19:32:06Z dumbbell $*/
-/*$NetBSD: ixgbe.h,v 1.20 2017/01/25 07:46:53 msaitoh Exp $*/
+/*$NetBSD: ixgbe.h,v 1.21 2017/01/30 05:02:43 msaitoh Exp $*/
 
 
 #ifndef _IXGBE_H_
@@ -590,8 +590,8 @@
        struct evcnt            other_tx_dma_setup;
        struct evcnt            eagain_tx_dma_setup;
        struct evcnt            enomem_tx_dma_setup;
+       struct evcnt            tso_err;
        struct evcnt            watchdog_events;
-       struct evcnt            tso_err;
        struct evcnt            link_irq;
        struct evcnt            morerx;
        struct evcnt            moretx;