broadcom-wl: assign first increased mac address to internal wifi core

When the original mac addresses are not valid assign the first one to
the internal wifi core, this matches the manufacture mac address in
most cases. In addition refresh the patches.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

SVN-Revision: 41545
This commit is contained in:
Hauke Mehrtens 2014-07-07 17:38:54 +00:00
parent 8a792ca2bb
commit 189edfef1a
4 changed files with 7 additions and 7 deletions

View file

@ -77,7 +77,7 @@ Signed-off-by: George Kashperko <george@znau.edu.ua>
#endif /* mips */ #endif /* mips */
} }
} }
@@ -404,7 +422,7 @@ osl_dma_unmap(osl_t *osh, uint pa, uint @@ -404,7 +422,7 @@ osl_dma_unmap(osl_t *osh, uint pa, uint
ASSERT((osh && (osh->magic == OS_HANDLE_MAGIC))); ASSERT((osh && (osh->magic == OS_HANDLE_MAGIC)));
dir = (direction == DMA_TX)? PCI_DMA_TODEVICE: PCI_DMA_FROMDEVICE; dir = (direction == DMA_TX)? PCI_DMA_TODEVICE: PCI_DMA_FROMDEVICE;

View file

@ -1,6 +1,6 @@
--- a/driver/wl_linux.c 2012-09-26 20:51:48.099454971 -0400 --- a/driver/wl_linux.c
+++ b/driver/wl_linux.c 2012-09-26 20:53:24.115453441 -0400 +++ b/driver/wl_linux.c
@@ -695,7 +695,7 @@ @@ -695,7 +695,7 @@ wl_attach(uint16 vendor, uint16 device,
if (wl->bustype != JTAG_BUS) if (wl->bustype != JTAG_BUS)
#endif /* BCMJTAG */ #endif /* BCMJTAG */
{ {

View file

@ -1,6 +1,6 @@
--- a/driver/wl_iw.c --- a/driver/wl_iw.c
+++ b/driver/wl_iw.c +++ b/driver/wl_iw.c
@@ -314,7 +314,7 @@ @@ -314,7 +314,7 @@ wl_iw_get_name(
) )
{ {
int phytype, err; int phytype, err;
@ -9,7 +9,7 @@
char cap[5]; char cap[5];
WL_TRACE(("%s: SIOCGIWNAME\n", dev->name)); WL_TRACE(("%s: SIOCGIWNAME\n", dev->name));
@@ -335,16 +335,20 @@ @@ -335,16 +335,20 @@ wl_iw_get_name(
break; break;
case WLC_PHY_TYPE_LP: case WLC_PHY_TYPE_LP:
case WLC_PHY_TYPE_G: case WLC_PHY_TYPE_G:

View file

@ -85,8 +85,8 @@
+ +
+ /* jump over the first free address so it can be used for wan */ + /* jump over the first free address so it can be used for wan */
+ nvram_increase_mac_addr(&macaddr_base, 1); + nvram_increase_mac_addr(&macaddr_base, 1);
+ nvram_change_mac_addr(new, &macaddr_base, "sb/1/macaddr");
+ nvram_change_mac_addr(new, &macaddr_base, "pci/1/1/macaddr"); + nvram_change_mac_addr(new, &macaddr_base, "pci/1/1/macaddr");
+ nvram_change_mac_addr(new, &macaddr_base, "pci/1/2/macaddr"); + nvram_change_mac_addr(new, &macaddr_base, "pci/1/2/macaddr");
+ nvram_change_mac_addr(new, &macaddr_base, "pci/2/1/macaddr"); + nvram_change_mac_addr(new, &macaddr_base, "pci/2/1/macaddr");
+ nvram_change_mac_addr(new, &macaddr_base, "sb/1/macaddr");
+} +}