Browse Source

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>
Hauke Mehrtens 11 years ago
parent
commit
5ab6329c52
2 changed files with 4 additions and 4 deletions
  1. 1 1
      drivers/net/ethernet/broadcom/b44.c
  2. 3 3
      drivers/net/ethernet/broadcom/b44.h

+ 1 - 1
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 */
 	/* do a phy reset to test if there is an active phy */
 	if (b44_phy_reset(bp) < 0)
 	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);
 	netdev_info(dev, "%s %pM\n", DRV_DESCRIPTION, dev->dev_addr);
 
 

+ 3 - 3
drivers/net/ethernet/broadcom/b44.h

@@ -280,9 +280,9 @@ struct ring_info {
 	dma_addr_t	mapping;
 	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		\
 #define	B44_STAT_REG_DECLARE		\
 	_B44(tx_good_octets)		\
 	_B44(tx_good_octets)		\