Commit 97bda706 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by Jeff Garzik
Browse files

[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: default avatarStephen Hemminger <shemminger@osdl.org>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 497d7c86

drivers/net/sky2.c

+2 −7
Original line number Diff line number Diff line
@@ -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)

	if (tx_avail(sky2) <= MAX_SKB_TX_LE)

		netif_stop_queue(dev);

	}



	sky2_put_idx(hw, txqaddr[sky2->port], sky2->tx_prod);

drivers/net/sky2.h

+0 −1
Original line number Diff line number Diff line
@@ -1748,7 +1748,6 @@ enum { 
	INIT_SUM= 1<<3,

	LOCK_SUM= 1<<4,

	INS_VLAN= 1<<5,

	FRC_STAT= 1<<6,

	EOP	= 1<<7,

};