lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] sky2: dont use force status bit

Browse Source 
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>
This commit is contained in:
shemminger@osdl.org
2006-08-28 10:00:47 -07:00
committed by Jeff Garzik
parent 497d7c8681
commit 97bda706b4
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/net/sky2.c
View File

@@ -1192,7 +1192,6 @@ static int sky2_xmit_frame(struct sk_buff *skb, struct net_device *dev)
struct sky2_tx_le *le = NULL; struct sky2_tx_le *le = NULL;
struct tx_ring_info *re; struct tx_ring_info *re;
unsigned i, len; unsigned i, len;
int avail;
dma_addr_t mapping; dma_addr_t mapping;
u32 addr64; u32 addr64;
u16 mss; u16 mss;
@@ -1328,12 +1327,8 @@ static int sky2_xmit_frame(struct sk_buff *skb, struct net_device *dev)
re->idx = sky2->tx_prod; re->idx = sky2->tx_prod;
le->ctrl |= EOP; le->ctrl |= EOP;
avail = tx_avail(sky2); if (tx_avail(sky2) <= MAX_SKB_TX_LE)
if (mss != 0 || avail < TX_MIN_PENDING) {
le->ctrl |= FRC_STAT;
if (avail <= MAX_SKB_TX_LE)
netif_stop_queue(dev); netif_stop_queue(dev);
}
sky2_put_idx(hw, txqaddr[sky2->port], sky2->tx_prod); sky2_put_idx(hw, txqaddr[sky2->port], sky2->tx_prod);

1
drivers/net/sky2.h
View File

@@ -1748,7 +1748,6 @@ enum {
INIT_SUM= 1<<3, INIT_SUM= 1<<3,
LOCK_SUM= 1<<4, LOCK_SUM= 1<<4,
INS_VLAN= 1<<5, INS_VLAN= 1<<5,
FRC_STAT= 1<<6,
EOP = 1<<7, EOP = 1<<7,
}; };