diff options
author | shemminger@osdl.org <shemminger@osdl.org> | 2006-08-28 13:00:47 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-08-29 17:18:29 -0400 |
commit | 97bda706b475655088201d7bb96cb8dd6d0d1aa3 (patch) | |
tree | d691e4a6128a2edc45886120561a8cdc532b057b /drivers/net/sky2.c | |
parent | 497d7c8681dec5084b2e79193c2aaeddc789477f (diff) |
[PATCH] sky2: dont use force status bit
Don't use force status bit. It was never implemented on all chips, or has
no impact.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/sky2.c')
-rw-r--r-- | drivers/net/sky2.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index 8d541bbc5e64..6cc5696e9a3e 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c | |||
@@ -1192,7 +1192,6 @@ static int sky2_xmit_frame(struct sk_buff *skb, struct net_device *dev) | |||
1192 | struct sky2_tx_le *le = NULL; | 1192 | struct sky2_tx_le *le = NULL; |
1193 | struct tx_ring_info *re; | 1193 | struct tx_ring_info *re; |
1194 | unsigned i, len; | 1194 | unsigned i, len; |
1195 | int avail; | ||
1196 | dma_addr_t mapping; | 1195 | dma_addr_t mapping; |
1197 | u32 addr64; | 1196 | u32 addr64; |
1198 | u16 mss; | 1197 | u16 mss; |
@@ -1328,12 +1327,8 @@ static int sky2_xmit_frame(struct sk_buff *skb, struct net_device *dev) | |||
1328 | re->idx = sky2->tx_prod; | 1327 | re->idx = sky2->tx_prod; |
1329 | le->ctrl |= EOP; | 1328 | le->ctrl |= EOP; |
1330 | 1329 | ||
1331 | avail = tx_avail(sky2); | 1330 | if (tx_avail(sky2) <= MAX_SKB_TX_LE) |
1332 | if (mss != 0 || avail < TX_MIN_PENDING) { | 1331 | netif_stop_queue(dev); |
1333 | le->ctrl |= FRC_STAT; | ||
1334 | if (avail <= MAX_SKB_TX_LE) | ||
1335 | netif_stop_queue(dev); | ||
1336 | } | ||
1337 | 1332 | ||
1338 | sky2_put_idx(hw, txqaddr[sky2->port], sky2->tx_prod); | 1333 | sky2_put_idx(hw, txqaddr[sky2->port], sky2->tx_prod); |
1339 | 1334 | ||