diff options
| author | shemminger@osdl.org <shemminger@osdl.org> | 2006-08-28 21:00:47 +0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-08-30 01:18:29 +0400 |
| commit | 97bda706b475655088201d7bb96cb8dd6d0d1aa3 (patch) | |
| tree | d691e4a6128a2edc45886120561a8cdc532b057b /drivers/net | |
| parent | 497d7c8681dec5084b2e79193c2aaeddc789477f (diff) | |
| download | linux-97bda706b475655088201d7bb96cb8dd6d0d1aa3.tar.xz | |
[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')
| -rw-r--r-- | drivers/net/sky2.c | 9 | ||||
| -rw-r--r-- | drivers/net/sky2.h | 1 |
2 files changed, 2 insertions, 8 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) struct sky2_tx_le *le = NULL; struct tx_ring_info *re; unsigned i, len; - int avail; dma_addr_t mapping; u32 addr64; u16 mss; @@ -1328,12 +1327,8 @@ static int sky2_xmit_frame(struct sk_buff *skb, struct net_device *dev) re->idx = sky2->tx_prod; le->ctrl |= EOP; - avail = tx_avail(sky2); - if (mss != 0 || avail < TX_MIN_PENDING) { - le->ctrl |= FRC_STAT; - if (avail <= MAX_SKB_TX_LE) - netif_stop_queue(dev); - } + if (tx_avail(sky2) <= MAX_SKB_TX_LE) + netif_stop_queue(dev); sky2_put_idx(hw, txqaddr[sky2->port], sky2->tx_prod); diff --git a/drivers/net/sky2.h b/drivers/net/sky2.h index 2db8d19b22d1..bb92f694247f 100644 --- a/drivers/net/sky2.h +++ b/drivers/net/sky2.h @@ -1748,7 +1748,6 @@ enum { INIT_SUM= 1<<3, LOCK_SUM= 1<<4, INS_VLAN= 1<<5, - FRC_STAT= 1<<6, EOP = 1<<7, }; |