The patch titled
spidernet: move medium variable into card struct
has been removed from the -mm tree. Its filename was
spidernet-move-medium-variable-into-card-struct.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: spidernet: move medium variable into card struct
From: Jens Osterkamp <jens@xxxxxxxxxx>
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@xxxxxxxxxx>
Signed-off-by: Linas Vepstas <linas@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/net/spider_net.c | 14 +++++++-------
drivers/net/spider_net.h | 2 ++
2 files changed, 9 insertions(+), 7 deletions(-)
diff -puN drivers/net/spider_net.c~spidernet-move-medium-variable-into-card-struct drivers/net/spider_net.c
--- a/drivers/net/spider_net.c~spidernet-move-medium-variable-into-card-struct
+++ a/drivers/net/spider_net.c
@@ -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;
}
diff -puN drivers/net/spider_net.h~spidernet-move-medium-variable-into-card-struct drivers/net/spider_net.h
--- a/drivers/net/spider_net.h~spidernet-move-medium-variable-into-card-struct
+++ a/drivers/net/spider_net.h
@@ -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;
_
Patches currently in -mm which might be from jens@xxxxxxxxxx are
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
