Module Name: src
Committed By: msaitoh
Date: Mon Jan 30 05:02:43 UTC 2017
Modified Files:
src/sys/dev/pci/ixgbe: ix_txrx.c ixgbe.h
Log Message:
- Count tso_err again. It was accidentally removed in ixgbe.c rev. 1.28.
- ixgbe.h: Sort entries to reduce diff against FreeBSD.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/pci/ixgbe/ix_txrx.c
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/pci/ixgbe/ixgbe.h
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/ix_txrx.c
diff -u src/sys/dev/pci/ixgbe/ix_txrx.c:1.16 src/sys/dev/pci/ixgbe/ix_txrx.c:1.17
--- src/sys/dev/pci/ixgbe/ix_txrx.c:1.16 Thu Jan 19 06:56:33 2017
+++ src/sys/dev/pci/ixgbe/ix_txrx.c Mon Jan 30 05:02:43 2017
@@ -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 @@ ixgbe_tx_ctx_setup(struct tx_ring *txr,
/* 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;
Index: src/sys/dev/pci/ixgbe/ixgbe.h
diff -u src/sys/dev/pci/ixgbe/ixgbe.h:1.20 src/sys/dev/pci/ixgbe/ixgbe.h:1.21
--- src/sys/dev/pci/ixgbe/ixgbe.h:1.20 Wed Jan 25 07:46:53 2017
+++ src/sys/dev/pci/ixgbe/ixgbe.h Mon Jan 30 05:02:43 2017
@@ -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 adapter {
struct evcnt other_tx_dma_setup;
struct evcnt eagain_tx_dma_setup;
struct evcnt enomem_tx_dma_setup;
- struct evcnt watchdog_events;
struct evcnt tso_err;
+ struct evcnt watchdog_events;
struct evcnt link_irq;
struct evcnt morerx;
struct evcnt moretx;
