diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2012-01-27 20:08:49 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2012-01-27 20:08:49 +0000 |
| commit | 45329cd793d17957350f109e8d7f227baf48b783 (patch) | |
| tree | b34c7822b928639a50ddf2352e9e8cfc2b4463a9 /package/mac80211 | |
| parent | 90805c366c778ef02adb244bf859ccfe76c73a10 (diff) | |
| download | upstream-45329cd793d17957350f109e8d7f227baf48b783.tar.gz upstream-45329cd793d17957350f109e8d7f227baf48b783.tar.bz2 upstream-45329cd793d17957350f109e8d7f227baf48b783.zip | |
mac80211: fix patch when running on ssb based devices
SVN-Revision: 29922
Diffstat (limited to 'package/mac80211')
| -rw-r--r-- | package/mac80211/patches/830-b43-workaround-pcie-bcm4716.patch | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/package/mac80211/patches/830-b43-workaround-pcie-bcm4716.patch b/package/mac80211/patches/830-b43-workaround-pcie-bcm4716.patch index 834a253be5..7a53bbf171 100644 --- a/package/mac80211/patches/830-b43-workaround-pcie-bcm4716.patch +++ b/package/mac80211/patches/830-b43-workaround-pcie-bcm4716.patch @@ -1,4 +1,4 @@ -From 8a0e33bd81eafd86252acf7d7ff1bd5362208d7a Mon Sep 17 00:00:00 2001 +From 4f214b1ead0af7439921637645cb63f378516175 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens <hauke@hauke-m.de> Date: Sat, 21 Jan 2012 18:48:38 +0100 Subject: [PATCH 33/34] b43: add workaround for b43 on pcie bus of bcm4716. @@ -11,15 +11,15 @@ This code is based on the brcmsmac driver. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> --- - drivers/net/wireless/b43/b43.h | 25 +++++++++++++++++++++++++ + drivers/net/wireless/b43/b43.h | 26 ++++++++++++++++++++++++++ drivers/net/wireless/b43/bus.h | 10 ++++++++++ drivers/net/wireless/b43/phy_common.c | 6 ++++++ drivers/net/wireless/b43/phy_n.c | 10 +++++----- - 4 files changed, 46 insertions(+), 5 deletions(-) + 4 files changed, 47 insertions(+), 5 deletions(-) --- a/drivers/net/wireless/b43/b43.h +++ b/drivers/net/wireless/b43/b43.h -@@ -1016,6 +1016,31 @@ static inline bool b43_using_pio_transfe +@@ -1016,6 +1016,32 @@ static inline bool b43_using_pio_transfe return dev->__using_pio_transfers; } @@ -28,11 +28,12 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> + * transactions. As a fix, a read after write is performed on certain places + * in the code. Older chips and the newer 5357 family don't require this fix. + */ -+#ifdef CONFIG_BCM47XX ++#ifdef CONFIG_BCM47XX_BCMA +#include <asm/mach-bcm47xx/bcm47xx.h> +static inline void b43_wflush16(struct b43_wldev *dev, u16 offset, u16 value) +{ + if (b43_bus_host_is_pci(dev->dev) && ++ bcm47xx_bus_type == BCM47XX_BUS_TYPE_BCMA && + (bcm47xx_bus.bcma.bus.chipinfo.id == 0x4716 || + bcm47xx_bus.bcma.bus.chipinfo.id == 0x5300)) { + b43_write16(dev, offset, value); |