Changeset 29922


Ignore:
Timestamp:
2012-01-27T21:08:49+01:00 (5 years ago)
Author:
hauke
Message:

mac80211: fix patch when running on ssb based devices

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/mac80211/patches/830-b43-workaround-pcie-bcm4716.patch

    r29843 r29922  
    1 From 8a0e33bd81eafd86252acf7d7ff1bd5362208d7a Mon Sep 17 00:00:00 2001 
     1From 4f214b1ead0af7439921637645cb63f378516175 Mon Sep 17 00:00:00 2001 
    22From: Hauke Mehrtens <hauke@hauke-m.de> 
    33Date: Sat, 21 Jan 2012 18:48:38 +0100 
     
    1212Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> 
    1313--- 
    14  drivers/net/wireless/b43/b43.h        |   25 +++++++++++++++++++++++++ 
     14 drivers/net/wireless/b43/b43.h        |   26 ++++++++++++++++++++++++++ 
    1515 drivers/net/wireless/b43/bus.h        |   10 ++++++++++ 
    1616 drivers/net/wireless/b43/phy_common.c |    6 ++++++ 
    1717 drivers/net/wireless/b43/phy_n.c      |   10 +++++----- 
    18  4 files changed, 46 insertions(+), 5 deletions(-) 
     18 4 files changed, 47 insertions(+), 5 deletions(-) 
    1919 
    2020--- a/drivers/net/wireless/b43/b43.h 
    2121+++ b/drivers/net/wireless/b43/b43.h 
    22 @@ -1016,6 +1016,31 @@ static inline bool b43_using_pio_transfe 
     22@@ -1016,6 +1016,32 @@ static inline bool b43_using_pio_transfe 
    2323        return dev->__using_pio_transfers; 
    2424 } 
     
    2929+ * in the code. Older chips and the newer 5357 family don't require this fix. 
    3030+ */ 
    31 +#ifdef CONFIG_BCM47XX 
     31+#ifdef CONFIG_BCM47XX_BCMA 
    3232+#include <asm/mach-bcm47xx/bcm47xx.h> 
    3333+static inline void b43_wflush16(struct b43_wldev *dev, u16 offset, u16 value) 
    3434+{ 
    3535+       if (b43_bus_host_is_pci(dev->dev) && 
     36+           bcm47xx_bus_type == BCM47XX_BUS_TYPE_BCMA && 
    3637+           (bcm47xx_bus.bcma.bus.chipinfo.id == 0x4716 || 
    3738+            bcm47xx_bus.bcma.bus.chipinfo.id == 0x5300)) { 
Note: See TracChangeset for help on using the changeset viewer.