diff options
| author | Ben Hutchings <bhutchings@solarflare.com> | 2010-12-10 04:24:16 +0300 |
|---|---|---|
| committer | Ben Hutchings <bhutchings@solarflare.com> | 2010-12-10 22:53:46 +0300 |
| commit | c04bfc6b223662c42a77727342c1df7d39e686a2 (patch) | |
| tree | 96f8623e13366b677f8437ba678f617231942d58 /drivers/net/sfc/efx.h | |
| parent | 6ecfd0c70c05531b2850649d0cec46833cd6c381 (diff) | |
| download | linux-c04bfc6b223662c42a77727342c1df7d39e686a2.tar.xz | |
sfc: Remove ancient support for nesting of TX stop
Long before this driver went into mainline, it had support for
multiple TX queues per port, with lockless TX enabled. Since Linux
did not know anything of this, filling up any hardware TX queue would
stop the core TX queue and multiple hardware TX queues could fill up
before the scheduler reacted. Thus it was necessary to keep a count
of how many TX queues were stopped and to wake the core TX queue only
when all had free space again.
The driver also previously (ab)used the per-hardware-queue stopped
flag as a counter to deal with various things that can inhibit TX, but
it no longer does that.
Remove the per-channel tx_stop_count, tx_stop_lock and
per-hardware-queue stopped count and just use the networking core
queue state directly.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Diffstat (limited to 'drivers/net/sfc/efx.h')
| -rw-r--r-- | drivers/net/sfc/efx.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/sfc/efx.h b/drivers/net/sfc/efx.h index 003fdb35b4bb..d43a7e5212b1 100644 --- a/drivers/net/sfc/efx.h +++ b/drivers/net/sfc/efx.h @@ -36,8 +36,6 @@ efx_hard_start_xmit(struct sk_buff *skb, struct net_device *net_dev); extern netdev_tx_t efx_enqueue_skb(struct efx_tx_queue *tx_queue, struct sk_buff *skb); extern void efx_xmit_done(struct efx_tx_queue *tx_queue, unsigned int index); -extern void efx_stop_queue(struct efx_channel *channel); -extern void efx_wake_queue(struct efx_channel *channel); /* RX */ extern int efx_probe_rx_queue(struct efx_rx_queue *rx_queue); |