From: linas@austin•ibm.com (Linas Vepstas)
To: Benjamin Herrenschmidt <benh@kernel•crashing.org>
Cc: arnd@arndb•de, linuxppc-dev@ozlabs•org
Subject: [PATCH 7/12] spidernet: move medium variable into card struct
Date: Thu, 15 Feb 2007 18:50:44 -0600 [thread overview]
Message-ID: <20070216005044.GG8192@austin.ibm.com> (raw)
In-Reply-To: <20070216004325.GA8192@austin.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-git4/drivers/net/spider_net.c
===================================================================
--- linux-2.6.20-git4.orig/drivers/net/spider_net.c 2007-02-15 17:55:19.000000000 -0600
+++ linux-2.6.20-git4/drivers/net/spider_net.c 2007-02-15 17:57:55.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-git4/drivers/net/spider_net.h
===================================================================
--- linux-2.6.20-git4.orig/drivers/net/spider_net.h 2007-02-15 17:54:57.000000000 -0600
+++ linux-2.6.20-git4/drivers/net/spider_net.h 2007-02-15 17:57:55.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-16 0:50 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <200701260724.l0Q7OISY027645@toshiba.co.jp>
2007-01-26 7:46 ` [PATCHSET] libata: PATA driver for Celleb Jeff Garzik
2007-02-14 5:19 ` Akira Iguchi
[not found] ` <200702140518.l1E5IoWX010896@toshiba.co.jp>
2007-02-14 5:29 ` Benjamin Herrenschmidt
2007-02-15 5:07 ` Jeff Garzik
2007-02-15 7:52 ` Benjamin Herrenschmidt
2007-02-15 10:41 ` Jens Osterkamp
2007-02-15 16:03 ` Jim Lewis
2007-02-15 17:14 ` Linas Vepstas
2007-02-15 18:09 ` Arnd Bergmann
2007-02-15 19:11 ` Linas Vepstas
2007-02-19 21:56 ` Alan
2007-02-19 21:21 ` Benjamin Herrenschmidt
2007-02-19 23:46 ` Alan
2007-02-19 23:17 ` Bartlomiej Zolnierkiewicz
2007-02-19 23:28 ` Benjamin Herrenschmidt
2007-02-19 23:18 ` Benjamin Herrenschmidt
2007-02-19 21:43 ` Benjamin Herrenschmidt
2007-02-20 8:14 ` Geert Uytterhoeven
2007-02-15 20:46 ` Benjamin Herrenschmidt
2007-02-16 0:18 ` [PATCHSET] spidernet, sungem_phy: consolidated patch series Linas Vepstas
2007-02-16 0:43 ` [PATCH 1/12]: sungem_phy: support bcm5461 phy, autoneg Linas Vepstas
2007-02-16 0:44 ` [PATCH 2/12]: spidernet: compile break Linas Vepstas
2007-02-16 0:45 ` [PATCH 3/12] spidernet: autoneg support for Celleb Linas Vepstas
2007-02-16 0:46 ` [PATCH 4/12] spidernet: load firmware when open Linas Vepstas
2007-02-16 0:48 ` [PATCH 5/12] spidernet: spidernet: add support for Celleb Linas Vepstas
2007-02-16 0:49 ` [PATCH 6/12] spidernet: remove txram full logging Linas Vepstas
2007-02-16 0:50 ` Linas Vepstas [this message]
2007-02-16 0:52 ` [PATCH 8/12] Spidernet: separate hardware state from driver state Linas Vepstas
2007-02-16 0:53 ` [PATCH: 9/12]: spidernet: fix racy double-free of skb Linas Vepstas
2007-02-16 0:55 ` [PATCH 10/12] spidernet: transmit race Linas Vepstas
2007-02-16 0:57 ` [PATCH 11/12] spidernet: janitorial, typos Linas Vepstas
2007-02-16 0:58 ` [PATCH 12/12]: spidernet: maintainership Linas Vepstas
2007-02-16 14:46 ` [PATCH 1/12]: sungem_phy: support bcm5461 phy, autoneg Arnd Bergmann
2007-02-16 16:19 ` Linas Vepstas
2007-02-15 5:12 ` spidernet (was Re: [PATCHSET] libata: PATA driver for Celleb) Jeff Garzik
2007-02-15 7:52 ` Benjamin Herrenschmidt
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=20070216005044.GG8192@austin.ibm.com \
--to=linas@austin$(echo .)ibm.com \
--cc=arnd@arndb$(echo .)de \
--cc=benh@kernel$(echo .)crashing.org \
--cc=linuxppc-dev@ozlabs$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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