44 lines
1.5 KiB
Diff
44 lines
1.5 KiB
Diff
From 5ab6329c5224d8135d76da18066edf3395f679f5 Mon Sep 17 00:00:00 2001
|
|
From: Hauke Mehrtens <hauke@hauke-m.de>
|
|
Date: Fri, 20 Dec 2013 02:16:07 +0100
|
|
Subject: [PATCH 202/208] b44: rename B44_PHY_ADDR_NO_PHY to
|
|
B44_PHY_ADDR_NO_LOCAL_PHY
|
|
|
|
The PHY address 30 means there is no local PHY, but there could be an
|
|
external PHY like a switch connected via MII. This is the case on most
|
|
embedded home routers where this driver is used.
|
|
|
|
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
drivers/net/ethernet/broadcom/b44.c | 2 +-
|
|
drivers/net/ethernet/broadcom/b44.h | 6 +++---
|
|
2 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/broadcom/b44.c
|
|
+++ b/drivers/net/ethernet/broadcom/b44.c
|
|
@@ -2238,7 +2238,7 @@ static int b44_init_one(struct ssb_devic
|
|
|
|
/* do a phy reset to test if there is an active phy */
|
|
if (b44_phy_reset(bp) < 0)
|
|
- bp->phy_addr = B44_PHY_ADDR_NO_PHY;
|
|
+ bp->phy_addr = B44_PHY_ADDR_NO_LOCAL_PHY;
|
|
|
|
netdev_info(dev, "%s %pM\n", DRV_DESCRIPTION, dev->dev_addr);
|
|
|
|
--- a/drivers/net/ethernet/broadcom/b44.h
|
|
+++ b/drivers/net/ethernet/broadcom/b44.h
|
|
@@ -280,9 +280,9 @@ struct ring_info {
|
|
dma_addr_t mapping;
|
|
};
|
|
|
|
-#define B44_MCAST_TABLE_SIZE 32
|
|
-#define B44_PHY_ADDR_NO_PHY 30
|
|
-#define B44_MDC_RATIO 5000000
|
|
+#define B44_MCAST_TABLE_SIZE 32
|
|
+#define B44_PHY_ADDR_NO_LOCAL_PHY 30 /* no local phy regs */
|
|
+#define B44_MDC_RATIO 5000000
|
|
|
|
#define B44_STAT_REG_DECLARE \
|
|
_B44(tx_good_octets) \
|