LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: linas@austin.ibm.com (Linas Vepstas)
To: Jeff Garzik <jeff@garzik.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>,
kou.ishizaki@toshiba.co.jp, arnd@arndb.de,
Jens Osterkamp <jens@de.ibm.com>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 7/12] spidernet: move medium variable into card struct
Date: Tue, 20 Feb 2007 16:39:13 -0600 [thread overview]
Message-ID: <20070220223913.GG28895@austin.ibm.com> (raw)
In-Reply-To: <20070220221314.GU923@austin.ibm.com>
From: Jens Osterkamp <jens@de.ibm.com>
This moves the medium variable into the spidernet card structure.
It renames the GMII_ variables to BCM54XX specific ones.
Signed-off-by: Jens Osterkamp <jens@de.ibm.com>
Signed-off-by: Linas Vepstas <linas@austin.ibm.com>
----
drivers/net/spider_net.c | 14 +++++++-------
drivers/net/spider_net.h | 2 ++
2 files changed, 9 insertions(+), 7 deletions(-)
Index: linux-2.6.20-git16/drivers/net/spider_net.c
===================================================================
--- linux-2.6.20-git16.orig/drivers/net/spider_net.c 2007-02-20 15:02:40.000000000 -0600
+++ linux-2.6.20-git16/drivers/net/spider_net.c 2007-02-20 15:02:42.000000000 -0600
@@ -1909,26 +1909,26 @@ static void spider_net_link_phy(unsigned
pr_info("%s: link is down trying to bring it up\n", card->netdev->name);
- switch (phy->medium) {
- case GMII_COPPER:
+ switch (card->medium) {
+ case BCM54XX_COPPER:
/* enable fiber with autonegotiation first */
if (phy->def->ops->enable_fiber)
phy->def->ops->enable_fiber(phy, 1);
- phy->medium = GMII_FIBER;
+ card->medium = BCM54XX_FIBER;
break;
- case GMII_FIBER:
+ case BCM54XX_FIBER:
/* fiber didn't come up, try to disable fiber autoneg */
if (phy->def->ops->enable_fiber)
phy->def->ops->enable_fiber(phy, 0);
- phy->medium = GMII_UNKNOWN;
+ card->medium = BCM54XX_UNKNOWN;
break;
- case GMII_UNKNOWN:
+ case BCM54XX_UNKNOWN:
/* copper, fiber with and without failed,
* retry from beginning */
spider_net_setup_aneg(card);
- phy->medium = GMII_COPPER;
+ card->medium = BCM54XX_COPPER;
break;
}
Index: linux-2.6.20-git16/drivers/net/spider_net.h
===================================================================
--- linux-2.6.20-git16.orig/drivers/net/spider_net.h 2007-02-20 15:02:38.000000000 -0600
+++ linux-2.6.20-git16/drivers/net/spider_net.h 2007-02-20 15:02:42.000000000 -0600
@@ -444,6 +444,8 @@ struct spider_net_card {
struct pci_dev *pdev;
struct mii_phy phy;
+ int medium;
+
void __iomem *regs;
struct spider_net_descr_chain tx_chain;
next prev parent reply other threads:[~2007-02-20 22:39 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-02-20 22:13 [PATCH 0/12]: spidernet updates Linas Vepstas
2007-02-20 22:30 ` [PATCH 1/12]: sungem_phy: support bcm5461 phy, autoneg Linas Vepstas
2007-02-27 9:16 ` Jeff Garzik
2007-02-20 22:32 ` [PATCH 2/12] spidernet: compile break Linas Vepstas
2007-02-20 22:33 ` [PATCH 3/12] spidernet: autoneg support for Celleb Linas Vepstas
2007-02-20 22:34 ` [PATCH 4/12] spidernet: load firmware when open Linas Vepstas
2007-02-20 22:36 ` [PATCH 5/12] spidernet: spidernet: add support for Celleb Linas Vepstas
2007-02-20 22:37 ` [PATCH 6/12] spidernet: remove txram full logging Linas Vepstas
2007-02-20 22:39 ` Linas Vepstas [this message]
2007-02-20 22:40 ` [PATCH 8/12] spidernet: separate hardware state from driver state Linas Vepstas
2007-02-20 22:41 ` [PATCH 9/12]: spidernet: fix racy double-free of skb Linas Vepstas
2007-02-20 22:41 ` [PATCH 10/12]: spidernet: transmit race Linas Vepstas
2007-02-20 22:42 ` [PATCH 11/12] spidernet: janitorial, typos Linas Vepstas
2007-02-20 22:45 ` [PATCH 12/12] spidernet: maintainership Linas Vepstas
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=20070220223913.GG28895@austin.ibm.com \
--to=linas@austin.ibm.com \
--cc=arnd@arndb.de \
--cc=benh@kernel.crashing.org \
--cc=jeff@garzik.org \
--cc=jens@de.ibm.com \
--cc=kou.ishizaki@toshiba.co.jp \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--subject='Re: [PATCH 7/12] spidernet: move medium variable into card struct' \
/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
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).