diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2011-07-22 16:30:42 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2011-07-22 16:30:42 +0000 |
commit | b988168906126ce52eeff275d0ec6eac75c7ed89 (patch) | |
tree | 633c44c5b54e1d59a2efa989cb0d13a863e7ae8f /target/linux/brcm47xx/patches-3.0/0022-bcma-use-randoom-mac-address-as-long-as-reading-it-o.patch | |
parent | 39f491e479eb74e6645ea6dce2219ff7d26570d1 (diff) | |
download | upstream-b988168906126ce52eeff275d0ec6eac75c7ed89.tar.gz upstream-b988168906126ce52eeff275d0ec6eac75c7ed89.tar.bz2 upstream-b988168906126ce52eeff275d0ec6eac75c7ed89.zip |
brcm47xx: update bcma and ssb to master-2011-07-21
* add new patches for bcm4716 SoC
* add support for serial flash on bcma bus
SVN-Revision: 27723
Diffstat (limited to 'target/linux/brcm47xx/patches-3.0/0022-bcma-use-randoom-mac-address-as-long-as-reading-it-o.patch')
-rw-r--r-- | target/linux/brcm47xx/patches-3.0/0022-bcma-use-randoom-mac-address-as-long-as-reading-it-o.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/target/linux/brcm47xx/patches-3.0/0022-bcma-use-randoom-mac-address-as-long-as-reading-it-o.patch b/target/linux/brcm47xx/patches-3.0/0022-bcma-use-randoom-mac-address-as-long-as-reading-it-o.patch new file mode 100644 index 0000000000..ca57a3c1b2 --- /dev/null +++ b/target/linux/brcm47xx/patches-3.0/0022-bcma-use-randoom-mac-address-as-long-as-reading-it-o.patch @@ -0,0 +1,33 @@ +From 6dd27601bee9b3c26cdb67246b6da51dd696ac34 Mon Sep 17 00:00:00 2001 +From: Hauke Mehrtens <hauke@hauke-m.de> +Date: Fri, 22 Jul 2011 17:11:51 +0200 +Subject: [PATCH 22/22] bcma: use randoom mac address as long as reading it out does not work + + +Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> +--- + drivers/bcma/sprom.c | 5 ++++- + 1 files changed, 4 insertions(+), 1 deletions(-) + +--- a/drivers/bcma/sprom.c ++++ b/drivers/bcma/sprom.c +@@ -13,6 +13,7 @@ + #include <linux/io.h> + #include <linux/dma-mapping.h> + #include <linux/slab.h> ++#include <linux/etherdevice.h> + + #define SPOFF(offset) ((offset) / sizeof(u16)) + +@@ -144,8 +145,10 @@ int bcma_sprom_get(struct bcma_bus *bus) + if (!bus->drv_cc.core) + return -EOPNOTSUPP; + +- if (!(bus->drv_cc.capabilities & BCMA_CC_CAP_SPROM)) ++ if (!(bus->drv_cc.capabilities & BCMA_CC_CAP_SPROM)) { ++ random_ether_addr(bus->sprom.il0mac); + return -ENOENT; ++ } + + sprom = kcalloc(SSB_SPROMSIZE_WORDS_R4, sizeof(u16), + GFP_KERNEL); |