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>

diff --git a/drivers/net/ethernet/broadcom/b44.c b/drivers/net/ethernet/broadcom/b44.c
index 3c7909e9c3eef3aa55efc075871ce5cdbb03c137..5c05d150f67b7b86601c7ddc17b8fa9523439196 100644 (file)
--- a/drivers/net/ethernet/broadcom/b44.c
+++ b/drivers/net/ethernet/broadcom/b44.c
@@ -2237,7 +2237,7 @@ static int b44_init_one(struct ssb_device *sdev,
 
        /* 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);
 

diff --git a/drivers/net/ethernet/broadcom/b44.h b/drivers/net/ethernet/broadcom/b44.h
index 8ed7d6b6d0c0bd90a15b16e143407a8bc1eda321..57e535768d25145180874c9504943ef0eb5a5454 100644 (file)
--- 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)            \