target/linux/brcm63xx/patches-3.2/260-ssb_sprom_mac_pool.patch

   1 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
   2 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
   3 @@ -862,18 +862,6 @@ void __init board_prom_init(void)
   4         }
   5
   6         bcm_gpio_writel(val, GPIO_MODE_REG);
   7 -
   8 -       /* Generate MAC address for WLAN and
   9 -        * register our SPROM */
  10 -#ifdef CONFIG_SSB_PCIHOST
  11 -       if (!board_get_mac_address(bcm63xx_sprom.il0mac)) {
  12 -               memcpy(bcm63xx_sprom.et0mac, bcm63xx_sprom.il0mac, ETH_ALEN);
  13 -               memcpy(bcm63xx_sprom.et1mac, bcm63xx_sprom.il0mac, ETH_ALEN);
  14 -               if (ssb_arch_register_fallback_sprom(
  15 -                               &bcm63xx_get_fallback_sprom) < 0)
  16 -                       printk(KERN_ERR PFX "failed to register fallback SPROM\n");
  17 -       }
  18 -#endif
  19  }
  20
  21  /*
  22 @@ -949,6 +937,19 @@ int __init board_register_devices(void)
  23             !board_get_mac_address(board.enet1.mac_addr))
  24                 bcm63xx_enet_register(1, &board.enet1);
  25
  26 +       /* Generate MAC address for WLAN and
  27 +        * register our SPROM, do this after registering enet devices
  28 +        */
  29 +#ifdef CONFIG_SSB_PCIHOST
  30 +       if (!board_get_mac_address(bcm63xx_sprom.il0mac)) {
  31 +               memcpy(bcm63xx_sprom.et0mac, bcm63xx_sprom.il0mac, ETH_ALEN);
  32 +               memcpy(bcm63xx_sprom.et1mac, bcm63xx_sprom.il0mac, ETH_ALEN);
  33 +               if (ssb_arch_register_fallback_sprom(
  34 +                               &bcm63xx_get_fallback_sprom) < 0)
  35 +                       printk(KERN_ERR PFX "failed to register fallback SPROM\n");
  36 +       }
  37 +#endif
  38 +
  39         if (board.has_ehci0)
  40                 bcm63xx_ehci_register();
  41