diff options
| author | David S. Miller <davem@davemloft.net> | 2008-03-18 03:37:55 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-18 03:37:55 -0400 |
| commit | 577f99c1d08cf9cbdafd4e858dd13ff04d855090 (patch) | |
| tree | 0f726bbda9b18d311d4c95198bbd96cb7ac01db0 /drivers/net/cxgb3 | |
| parent | 26c0f03f6b77c513cb7bc37b73a06819bdbb791b (diff) | |
| parent | 2f633928cbba8a5858bb39b11e7219a41b0fbef5 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/rt2x00/rt2x00dev.c
net/8021q/vlan_dev.c
Diffstat (limited to 'drivers/net/cxgb3')
| -rw-r--r-- | drivers/net/cxgb3/sge.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/drivers/net/cxgb3/sge.c b/drivers/net/cxgb3/sge.c index 979f3fc5e765..db586870c5f4 100644 --- a/drivers/net/cxgb3/sge.c +++ b/drivers/net/cxgb3/sge.c | |||
| @@ -1107,9 +1107,15 @@ int t3_eth_xmit(struct sk_buff *skb, struct net_device *dev) | |||
| 1107 | } | 1107 | } |
| 1108 | 1108 | ||
| 1109 | q->in_use += ndesc; | 1109 | q->in_use += ndesc; |
| 1110 | if (unlikely(credits - ndesc < q->stop_thres)) | 1110 | if (unlikely(credits - ndesc < q->stop_thres)) { |
| 1111 | if (USE_GTS || !should_restart_tx(q)) | 1111 | t3_stop_queue(dev, qs, q); |
| 1112 | t3_stop_queue(dev, qs, q); | 1112 | |
| 1113 | if (should_restart_tx(q) && | ||
| 1114 | test_and_clear_bit(TXQ_ETH, &qs->txq_stopped)) { | ||
| 1115 | q->restarts++; | ||
| 1116 | netif_wake_queue(dev); | ||
| 1117 | } | ||
| 1118 | } | ||
| 1113 | 1119 | ||
| 1114 | gen = q->gen; | 1120 | gen = q->gen; |
| 1115 | q->unacked += ndesc; | 1121 | q->unacked += ndesc; |