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

diff --git a/package/kernel/broadcom-wl/patches/006-generic-dma-api.patch b/package/kernel/broadcom-wl/patches/006-generic-dma-api.patch
index a90bbe1f96ce88a33d79283bafaa2ce73fa71b30..d6dd5f0aaeadf16689cfdbddaed6e0eb8df4ddb6 100644 (file)
--- a/package/kernel/broadcom-wl/patches/006-generic-dma-api.patch
+++ b/package/kernel/broadcom-wl/patches/006-generic-dma-api.patch
@@ -77,7 +77,7 @@ Signed-off-by: George Kashperko <george@znau.edu.ua>
  #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)));
        dir = (direction == DMA_TX)? PCI_DMA_TODEVICE: PCI_DMA_FROMDEVICE;

diff --git a/package/kernel/broadcom-wl/patches/010-remove_irqf_samble_random.patch b/package/kernel/broadcom-wl/patches/010-remove_irqf_samble_random.patch
index 4bbbdcaaaa99e280d9f294639bb45a2086c2eabb..7b60873ebb8a0d2e31ee4568ed92777347fa8111 100644 (file)
--- a/package/kernel/broadcom-wl/patches/010-remove_irqf_samble_random.patch
+++ b/package/kernel/broadcom-wl/patches/010-remove_irqf_samble_random.patch
@@ -1,6 +1,6 @@
---- a/driver/wl_linux.c        2012-09-26 20:51:48.099454971 -0400
-+++ b/driver/wl_linux.c        2012-09-26 20:53:24.115453441 -0400
-@@ -695,7 +695,7 @@
+--- a/driver/wl_linux.c
++++ b/driver/wl_linux.c
+@@ -695,7 +695,7 @@ wl_attach(uint16 vendor, uint16 device,
        if (wl->bustype != JTAG_BUS)
  #endif        /* BCMJTAG */
        {

diff --git a/package/kernel/broadcom-wl/patches/014-fix-band-reporting.patch b/package/kernel/broadcom-wl/patches/014-fix-band-reporting.patch
index f1305a45d2ac65f448f958099428b08f4d663a71..b231fed98db63fe8226d570bde5a963545c167ce 100644 (file)
--- a/package/kernel/broadcom-wl/patches/014-fix-band-reporting.patch
+++ b/package/kernel/broadcom-wl/patches/014-fix-band-reporting.patch
@@ -1,6 +1,6 @@
 --- a/driver/wl_iw.c
 +++ b/driver/wl_iw.c
-@@ -314,7 +314,7 @@
+@@ -314,7 +314,7 @@ wl_iw_get_name(
  )
  {
        int phytype, err;
@@ -9,7 +9,7 @@
        char cap[5];
  
        WL_TRACE(("%s: SIOCGIWNAME\n", dev->name));
-@@ -335,16 +335,20 @@
+@@ -335,16 +335,20 @@ wl_iw_get_name(
                        break;
                case WLC_PHY_TYPE_LP:
                case WLC_PHY_TYPE_G:

diff --git a/package/kernel/broadcom-wl/patches/120-fixup-mac-addresses.patch b/package/kernel/broadcom-wl/patches/120-fixup-mac-addresses.patch
index f3d7c246e6d97c737aa4ee1e2a6ab9d8138b77ce..a07176d02d1b2c09b871253bce754ca3830e39b8 100644 (file)
--- a/package/kernel/broadcom-wl/patches/120-fixup-mac-addresses.patch
+++ b/package/kernel/broadcom-wl/patches/120-fixup-mac-addresses.patch
@@ -85,8 +85,8 @@
 +
 +      /* jump over the first free address so it can be used for wan */
 +      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/2/macaddr");
 +      nvram_change_mac_addr(new, &macaddr_base, "pci/2/1/macaddr");
-+      nvram_change_mac_addr(new, &macaddr_base, "sb/1/macaddr");
 +}