target/linux/brcm47xx/patches-3.10/202-b44-rename-B44_PHY_ADDR_NO_PHY-to-B44_PHY_ADDR_NO_LO.patch

   1 From 5ab6329c5224d8135d76da18066edf3395f679f5 Mon Sep 17 00:00:00 2001
   2 From: Hauke Mehrtens <hauke@hauke-m.de>
   3 Date: Fri, 20 Dec 2013 02:16:07 +0100
   4 Subject: [PATCH 202/208] b44: rename B44_PHY_ADDR_NO_PHY to
   5  B44_PHY_ADDR_NO_LOCAL_PHY
   6
   7 The PHY address 30 means there is no local PHY, but there could be an
   8 external PHY like a switch connected via MII. This is the case on most
   9 embedded home routers where this driver is used.
  10
  11 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
  12 Signed-off-by: David S. Miller <davem@davemloft.net>
  13 ---
  14  drivers/net/ethernet/broadcom/b44.c |    2 +-
  15  drivers/net/ethernet/broadcom/b44.h |    6 +++---
  16  2 files changed, 4 insertions(+), 4 deletions(-)
  17
  18 --- a/drivers/net/ethernet/broadcom/b44.c
  19 +++ b/drivers/net/ethernet/broadcom/b44.c
  20 @@ -2238,7 +2238,7 @@ static int b44_init_one(struct ssb_devic
  21
  22         /* do a phy reset to test if there is an active phy */
  23         if (b44_phy_reset(bp) < 0)
  24 -               bp->phy_addr = B44_PHY_ADDR_NO_PHY;
  25 +               bp->phy_addr = B44_PHY_ADDR_NO_LOCAL_PHY;
  26
  27         netdev_info(dev, "%s %pM\n", DRV_DESCRIPTION, dev->dev_addr);
  28
  29 --- a/drivers/net/ethernet/broadcom/b44.h
  30 +++ b/drivers/net/ethernet/broadcom/b44.h
  31 @@ -280,9 +280,9 @@ struct ring_info {
  32         dma_addr_t      mapping;
  33  };
  34
  35 -#define B44_MCAST_TABLE_SIZE   32
  36 -#define B44_PHY_ADDR_NO_PHY    30
  37 -#define B44_MDC_RATIO          5000000
  38 +#define B44_MCAST_TABLE_SIZE           32
  39 +#define B44_PHY_ADDR_NO_LOCAL_PHY      30 /* no local phy regs */
  40 +#define B44_MDC_RATIO                  5000000
  41
  42  #define        B44_STAT_REG_DECLARE            \
  43         _B44(tx_good_octets)            \