Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dev/pci/ixgbe Remove more ix*_start_locked() from interr...
details: https://anonhg.NetBSD.org/src/rev/1e871745df09
branches: trunk
changeset: 351441:1e871745df09
user: msaitoh <msaitoh%NetBSD.org@localhost>
date: Mon Feb 13 10:37:37 2017 +0000
description:
Remove more ix*_start_locked() from interrupt context like previous commit.
> Fix a bug that ix*_start_locked() is called in interrput context
> (ix*_msix_que). The function is called in softint(ix*_handle_que()). OK'd by
>k-nakahara.
diffstat:
sys/dev/pci/ixgbe/ixgbe.c | 13 +------------
sys/dev/pci/ixgbe/ixv.c | 11 +----------
2 files changed, 2 insertions(+), 22 deletions(-)
diffs (65 lines):
diff -r 885f7c337739 -r 1e871745df09 sys/dev/pci/ixgbe/ixgbe.c
--- a/sys/dev/pci/ixgbe/ixgbe.c Mon Feb 13 10:13:54 2017 +0000
+++ b/sys/dev/pci/ixgbe/ixgbe.c Mon Feb 13 10:37:37 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.75 2017/02/13 10:13:54 msaitoh Exp $*/
+/*$NetBSD: ixgbe.c,v 1.76 2017/02/13 10:37:37 msaitoh Exp $*/
#include "opt_inet.h"
#include "opt_inet6.h"
@@ -1627,13 +1627,6 @@
IXGBE_TX_LOCK(txr);
ixgbe_txeof(txr);
-#ifdef IXGBE_LEGACY_TX
- if (!IFQ_IS_EMPTY(&ifp->if_snd))
- ixgbe_start_locked(txr, ifp);
-#else
- if (pcq_peek(txr->txr_interq) != NULL)
- ixgbe_mq_start_locked(ifp, txr);
-#endif
IXGBE_TX_UNLOCK(txr);
}
@@ -1698,10 +1691,6 @@
IXGBE_TX_LOCK(txr);
ixgbe_txeof(txr);
-#ifdef IXGBE_LEGACY_TX
- if (!IFQ_IS_EMPTY(&adapter->ifp->if_snd))
- ixgbe_start_locked(txr, ifp);
-#endif
IXGBE_TX_UNLOCK(txr);
/* Do AIM now? */
diff -r 885f7c337739 -r 1e871745df09 sys/dev/pci/ixgbe/ixv.c
--- a/sys/dev/pci/ixgbe/ixv.c Mon Feb 13 10:13:54 2017 +0000
+++ b/sys/dev/pci/ixgbe/ixv.c Mon Feb 13 10:37:37 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.52 2017/02/13 10:13:54 msaitoh Exp $*/
+/*$NetBSD: ixv.c,v 1.53 2017/02/13 10:37:37 msaitoh Exp $*/
#include "opt_inet.h"
#include "opt_inet6.h"
@@ -933,15 +933,6 @@
IXGBE_TX_LOCK(txr);
ixgbe_txeof(txr);
- /*
- ** Make certain that if the stack
- ** has anything queued the task gets
- ** scheduled to handle it.
- */
-#ifdef IXGBE_LEGACY_TX
- if (!IFQ_IS_EMPTY(&adapter->ifp->if_snd))
- ixgbe_start_locked(txr, ifp);
-#endif
IXGBE_TX_UNLOCK(txr);
/* Do AIM now? */
Home |
Main Index |
Thread Index |
Old Index