diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2014-07-07 17:38:54 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2014-07-07 17:38:54 +0000 |
| commit | 43474360c78cbad132edb1348dd0c257b38d4389 (patch) | |
| tree | 85b0ec229f32a1c428d335b2fd2806b3f04e8767 /package/kernel | |
| parent | e71bcafce5da3cc2be2da74324a954773e531234 (diff) | |
| download | upstream-43474360c78cbad132edb1348dd0c257b38d4389.tar.gz upstream-43474360c78cbad132edb1348dd0c257b38d4389.tar.bz2 upstream-43474360c78cbad132edb1348dd0c257b38d4389.zip | |
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>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41545 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel')
4 files changed, 7 insertions, 7 deletions
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 a90bbe1f96..d6dd5f0aae 100644 --- 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 4bbbdcaaaa..7b60873ebb 100644 --- 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 f1305a45d2..b231fed98d 100644 --- 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 f3d7c246e6..a07176d02d 100644 --- 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"); +} |