From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, gospo@redhat.com,
Jesse Brandeburg <jesse.brandeburg@intel.com>,
Don Skidmore <donald.c.skidmore@intel.com>,
Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [net-2.6 PATCH 03/13] e1000: use netif_tx_disable
Date: Fri, 25 Sep 2009 15:17:01 -0700 [thread overview]
Message-ID: <20090925221701.26715.72584.stgit@localhost.localdomain> (raw)
In-Reply-To: <20090925221613.26715.66796.stgit@localhost.localdomain>
From: Jesse Brandeburg <jesse.brandeburg@intel.com>
we can use netif_tx_disable now because LLTX has been removed.
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Don Skidmore <donald.c.skidmore@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/e1000/e1000_main.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index cad6f65..4d6677e 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -485,8 +485,7 @@ void e1000_down(struct e1000_adapter *adapter)
ew32(RCTL, rctl & ~E1000_RCTL_EN);
/* flush and sleep below */
- /* can be netif_tx_disable when NETIF_F_LLTX is removed */
- netif_stop_queue(netdev);
+ netif_tx_disable(netdev);
/* disable transmits in the hardware */
tctl = er32(TCTL);
next prev parent reply other threads:[~2009-09-25 22:17 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-25 22:16 [net-2.6 PATCH 01/13] e1000: drop dead pcie code from e1000 Jeff Kirsher
2009-09-25 22:16 ` [net-2.6 PATCH 02/13] e1000: remove unused functions Jeff Kirsher
2009-09-25 22:17 ` Jeff Kirsher [this message]
2009-09-25 22:17 ` [net-2.6 PATCH 04/13] e1000: stop timers at appropriate times Jeff Kirsher
2009-09-25 22:17 ` [net-2.6 PATCH 05/13] e1000: test link state conclusively Jeff Kirsher
2009-09-25 22:18 ` [net-2.6 PATCH 06/13] e1000: fix tx waking queue after queue stopped during shutdown Jeff Kirsher
2009-09-25 22:18 ` [net-2.6 PATCH 07/13] e1000: two workarounds were incomplete, fix them Jeff Kirsher
2009-09-25 22:19 ` [net-2.6 PATCH 08/13] e1000: remove races when changing mtu Jeff Kirsher
2009-09-25 22:19 ` [net-2.6 PATCH 09/13] e1000: drop redunant line of code, cleanup Jeff Kirsher
2009-09-25 22:20 ` [net-2.6 PATCH 11/13] e1000: drop unused functionality for eeprom write/read Jeff Kirsher
2009-09-25 22:20 ` [net-2.6 PATCH 12/13] e1000: fix namespacecheck warnings Jeff Kirsher
2009-09-25 22:20 ` [net-2.6 PATCH 13/13] e1000: cleanup unused prototype Jeff Kirsher
2009-09-27 3:18 ` [net-2.6 PATCH 01/13] e1000: drop dead pcie code from e1000 David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090925221701.26715.72584.stgit@localhost.localdomain \
--to=jeffrey.t.kirsher@intel.com \
--cc=davem@davemloft.net \
--cc=donald.c.skidmore@intel.com \
--cc=gospo@redhat.com \
--cc=jesse.brandeburg@intel.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox