From: "Kok, Auke" <auke-jan.h.kok@intel.com>
To: "Garzik, Jeff" <jgarzik@pobox.com>
Cc: netdev@vger.kernel.org, "Brandeburg,
Jesse" <jesse.brandeburg@intel.com>,
"Kok, Auke" <auke-jan.h.kok@intel.com>,
"Kok, Auke" <auke@foo-projects.org>,
"Ronciak, John" <john.ronciak@intel.com>
Subject: [PATCH 1/8] e1000: simplify case handling gigabit at half duplex
Date: Fri, 12 Jan 2007 16:37:41 -0800 [thread overview]
Message-ID: <20070113003741.16816.82031.stgit@gitlost.site> (raw)
In-Reply-To: <20070113003650.16816.34076.stgit@gitlost.site>
Remvoe duplicate code handling erraneous user supplied wrong case
of gigabit speed with half duplex.
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
---
drivers/net/e1000/e1000_param.c | 15 +++------------
1 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/drivers/net/e1000/e1000_param.c b/drivers/net/e1000/e1000_param.c
index cf2a279..f8862e2 100644
--- a/drivers/net/e1000/e1000_param.c
+++ b/drivers/net/e1000/e1000_param.c
@@ -760,22 +760,13 @@ e1000_check_copper_options(struct e1000_adapter *adapter)
case SPEED_1000:
DPRINTK(PROBE, INFO, "1000 Mbps Speed specified without "
"Duplex\n");
- DPRINTK(PROBE, INFO,
- "Using Autonegotiation at 1000 Mbps "
- "Full Duplex only\n");
- adapter->hw.autoneg = adapter->fc_autoneg = 1;
- adapter->hw.autoneg_advertised = ADVERTISE_1000_FULL;
- break;
+ goto full_duplex_only;
case SPEED_1000 + HALF_DUPLEX:
DPRINTK(PROBE, INFO,
"Half Duplex is not supported at 1000 Mbps\n");
- DPRINTK(PROBE, INFO,
- "Using Autonegotiation at 1000 Mbps "
- "Full Duplex only\n");
- adapter->hw.autoneg = adapter->fc_autoneg = 1;
- adapter->hw.autoneg_advertised = ADVERTISE_1000_FULL;
- break;
+ /* fall through */
case SPEED_1000 + FULL_DUPLEX:
+full_duplex_only:
DPRINTK(PROBE, INFO,
"Using Autonegotiation at 1000 Mbps Full Duplex only\n");
adapter->hw.autoneg = adapter->fc_autoneg = 1;
---
Auke Kok <auke-jan.h.kok@intel.com>
next prev parent reply other threads:[~2007-01-13 0:54 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-01-13 0:36 [PATCH 0/8] partial resend: e1000 fixes and updates Kok, Auke
2007-01-13 0:37 ` Kok, Auke [this message]
2007-01-13 0:37 ` [PATCH 2/8] e1000: clean up debug output defines Kok, Auke
2007-01-13 0:37 ` [PATCH 3/8] e1000: Fix MSI only interrupt handler routine Kok, Auke
2007-01-13 0:37 ` [PATCH 4/8] e1000: fix NAPI performance on 4-port adapters Kok, Auke
2007-01-13 0:37 ` [PATCH 5/8] e1000: display flow control of link status at link up Kok, Auke
2007-01-13 0:37 ` [PATCH 6/8] e1000: clear ip csum info from context descriptor Kok, Auke
2007-01-13 0:37 ` [PATCH 7/8] e1000: tune our dynamic itr transmit packet accounting Kok, Auke
2007-01-13 0:37 ` [PATCH 8/8] e1000: update version to 7.3.20-k2 Kok, Auke
2007-01-18 16:56 ` [PATCH 0/8] partial resend: e1000 fixes and updates Jeff Garzik
2007-01-18 17:16 ` Auke Kok
2007-01-23 21:31 ` Jeff Garzik
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=20070113003741.16816.82031.stgit@gitlost.site \
--to=auke-jan.h.kok@intel.com \
--cc=auke@foo-projects.org \
--cc=jesse.brandeburg@intel.com \
--cc=jgarzik@pobox.com \
--cc=john.ronciak@intel.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).