diff options
| author | Mark Einon <mark.einon@gmail.com> | 2011-10-20 01:18:46 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-10-23 10:07:12 +0200 |
| commit | 06709e962322eb565f1e5ce591df7efb3db07c1f (patch) | |
| tree | 01be7759b6a2fc25b043c57c51fda30d4639da06 /drivers/staging/et131x | |
| parent | 26d19bf60be3a41bbd6c31d89d13a9c5e8edef8b (diff) | |
| download | linux-06709e962322eb565f1e5ce591df7efb3db07c1f.tar.gz linux-06709e962322eb565f1e5ce591df7efb3db07c1f.tar.bz2 linux-06709e962322eb565f1e5ce591df7efb3db07c1f.zip | |
staging: et131x: on transmit, stop the queue if the next packet will fail
* Currently the tx queue is only stopped when the current packet fails.
Check if the next packet will fail, and stop the queue if so.
* Removed associated item from TODO list in the README.
* Also minor fixup as adapter was being declared as null and immediately set
to a value.
Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/et131x')
| -rw-r--r-- | drivers/staging/et131x/README | 1 | ||||
| -rw-r--r-- | drivers/staging/et131x/et131x.c | 13 |
2 files changed, 6 insertions, 8 deletions
diff --git a/drivers/staging/et131x/README b/drivers/staging/et131x/README index 0928eb55fee1..3458aa713a33 100644 --- a/drivers/staging/et131x/README +++ b/drivers/staging/et131x/README @@ -9,7 +9,6 @@ driver as they did not build properly at the time. TODO: - Use of kmem_cache seems a bit unusual - - It's too late stopping the tx queue when there is no room for the current packet. The condition should be detected for the next packet. Please send patches to: Greg Kroah-Hartman <gregkh@suse.de> diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c index cc41111b7b70..993f93ac35ee 100644 --- a/drivers/staging/et131x/et131x.c +++ b/drivers/staging/et131x/et131x.c @@ -3448,9 +3448,7 @@ static int send_packet(struct sk_buff *skb, struct et131x_adapter *adapter) int et131x_send_packets(struct sk_buff *skb, struct net_device *netdev) { int status = 0; - struct et131x_adapter *adapter = NULL; - - adapter = netdev_priv(netdev); + struct et131x_adapter *adapter = netdev_priv(netdev); /* Send these packets * @@ -5347,6 +5345,11 @@ static void et131x_multicast(struct net_device *netdev) static int et131x_tx(struct sk_buff *skb, struct net_device *netdev) { int status = 0; + struct et131x_adapter *adapter = netdev_priv(netdev); + + /* stop the queue if it's getting full */ + if(adapter->tx_ring.used >= NUM_TCB - 1 && !netif_queue_stopped(netdev)) + netif_stop_queue(netdev); /* Save the timestamp for the TX timeout watchdog */ netdev->trans_start = jiffies; @@ -5357,10 +5360,6 @@ static int et131x_tx(struct sk_buff *skb, struct net_device *netdev) /* Check status and manage the netif queue if necessary */ if (status != 0) { if (status == -ENOMEM) { - /* Put the queue to sleep until resources are - * available - */ - netif_stop_queue(netdev); status = NETDEV_TX_BUSY; } else { status = NETDEV_TX_OK; |