netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: shemminger@osdl.org
To: Jeff Garzik <jgarzik@pobox.com>
Cc: netdev@vger.kernel.org
Subject: [PATCH 3/9] sky2: dont use force status bit
Date: Mon, 28 Aug 2006 10:00:47 -0700	[thread overview]
Message-ID: <20060828170216.265966554@localhost.localdomain> (raw)
In-Reply-To: 20060828170044.136391412@localhost.localdomain

[-- Attachment #1: sky2-ctl-bits.patch --]
[-- Type: text/plain, Size: 1081 bytes --]

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>

--- sky2.orig/drivers/net/sky2.c	2006-08-25 16:02:27.000000000 -0700
+++ sky2/drivers/net/sky2.c	2006-08-25 16:05:10.000000000 -0700
@@ -1192,7 +1192,6 @@
 	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 @@
 	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);
 
--- sky2.orig/drivers/net/sky2.h	2006-08-25 16:00:28.000000000 -0700
+++ sky2/drivers/net/sky2.h	2006-08-25 16:05:10.000000000 -0700
@@ -1748,7 +1748,6 @@
 	INIT_SUM= 1<<3,
 	LOCK_SUM= 1<<4,
 	INS_VLAN= 1<<5,
-	FRC_STAT= 1<<6,
 	EOP	= 1<<7,
 };
 

--
Stephen Hemminger <shemminger@osdl.org>


  parent reply	other threads:[~2006-08-28 18:16 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-08-28 17:00 [PATCH 0/9] sky2 1.7 non-critical bug fixes shemminger
2006-08-28 17:00 ` [PATCH 1/9] sky2: remove cloned/pskb_expand_head check shemminger
2006-08-29 21:18   ` Jeff Garzik
2006-08-28 17:00 ` [PATCH 2/9] sky2: use netdev_alloc_skb shemminger
2006-08-28 17:00 ` shemminger [this message]
2006-08-28 17:00 ` [PATCH 4/9] sky2: MSI test timing shemminger
2006-08-28 17:00 ` [PATCH 5/9] sky2: TSO mss optimization shemminger
2006-08-28 17:00 ` [PATCH 6/9] sky2: optimize checksum offload information shemminger
2006-08-28 17:00 ` [PATCH 7/9] sky2: power down PHY when not up shemminger
2006-08-29 21:04   ` Jeff Garzik
2006-08-29 21:11     ` Stephen Hemminger
2006-08-28 17:00 ` [PATCH 8/9] sky2: pci post bug shemminger
2006-08-28 17:00 ` [PATCH 9/9] sky2: version 1.7 shemminger

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20060828170216.265966554@localhost.localdomain \
    --to=shemminger@osdl.org \
    --cc=jgarzik@pobox.com \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).