aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2014-07-07 17:38:54 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2014-07-07 17:38:54 +0000
commit189edfef1a6001b5922726b116bbfca3313cb4d5 (patch)
tree15b027fc2229040c57b9713044a68d14fa81d8b3 /package/kernel
parent8a792ca2bbcc7db1024aefb68e3732ed492d3fe6 (diff)
downloadupstream-189edfef1a6001b5922726b116bbfca3313cb4d5.tar.gz
upstream-189edfef1a6001b5922726b116bbfca3313cb4d5.tar.bz2
upstream-189edfef1a6001b5922726b116bbfca3313cb4d5.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> SVN-Revision: 41545
Diffstat (limited to 'package/kernel')
-rw-r--r--package/kernel/broadcom-wl/patches/006-generic-dma-api.patch2
-rw-r--r--package/kernel/broadcom-wl/patches/010-remove_irqf_samble_random.patch6
-rw-r--r--package/kernel/broadcom-wl/patches/014-fix-band-reporting.patch4
-rw-r--r--package/kernel/broadcom-wl/patches/120-fixup-mac-addresses.patch2
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");
+}