diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2013-04-26 10:52:03 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2013-04-26 10:52:03 +0000 |
| commit | accc6e309e9f9ce94ce34c7b2cdf60e16c78d1e1 (patch) | |
| tree | 3b2ebce435696f7f85164376efffbc7758012c20 /package/mac80211/patches/830-b43-workaround-pcie-bcm4716.patch | |
| parent | bc453a52b2c3b3da4dba056048cb83db195fe189 (diff) | |
| download | upstream-accc6e309e9f9ce94ce34c7b2cdf60e16c78d1e1.tar.gz upstream-accc6e309e9f9ce94ce34c7b2cdf60e16c78d1e1.tar.bz2 upstream-accc6e309e9f9ce94ce34c7b2cdf60e16c78d1e1.zip | |
mac80211: update to wireless-testing 2013-04-16 + backports
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 36448
Diffstat (limited to 'package/mac80211/patches/830-b43-workaround-pcie-bcm4716.patch')
| -rw-r--r-- | package/mac80211/patches/830-b43-workaround-pcie-bcm4716.patch | 10 |
1 files changed, 5 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 bd10f996c2..66631218f5 100644 --- a/package/mac80211/patches/830-b43-workaround-pcie-bcm4716.patch +++ b/package/mac80211/patches/830-b43-workaround-pcie-bcm4716.patch @@ -19,7 +19,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> --- a/drivers/net/wireless/b43/b43.h +++ b/drivers/net/wireless/b43/b43.h -@@ -1053,6 +1053,32 @@ static inline bool b43_using_pio_transfe +@@ -1061,6 +1061,32 @@ static inline bool b43_using_pio_transfe return dev->__using_pio_transfers; } @@ -88,7 +88,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> dev->phy.writes_counter = 0; --- a/drivers/net/wireless/b43/phy_n.c +++ b/drivers/net/wireless/b43/phy_n.c -@@ -5423,14 +5423,14 @@ static inline void check_phyreg(struct b +@@ -5368,14 +5368,14 @@ static inline void check_phyreg(struct b static u16 b43_nphy_op_read(struct b43_wldev *dev, u16 reg) { check_phyreg(dev, reg); @@ -105,7 +105,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> b43_write16(dev, B43_MMIO_PHY_DATA, value); } -@@ -5438,7 +5438,7 @@ static void b43_nphy_op_maskset(struct b +@@ -5383,7 +5383,7 @@ static void b43_nphy_op_maskset(struct b u16 set) { check_phyreg(dev, reg); @@ -114,7 +114,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> b43_maskset16(dev, B43_MMIO_PHY_DATA, mask, set); } -@@ -5449,7 +5449,7 @@ static u16 b43_nphy_op_radio_read(struct +@@ -5394,7 +5394,7 @@ static u16 b43_nphy_op_radio_read(struct /* N-PHY needs 0x100 for read access */ reg |= 0x100; @@ -123,7 +123,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> return b43_read16(dev, B43_MMIO_RADIO_DATA_LOW); } -@@ -5458,7 +5458,7 @@ static void b43_nphy_op_radio_write(stru +@@ -5403,7 +5403,7 @@ static void b43_nphy_op_radio_write(stru /* Register 1 is a 32-bit register. */ B43_WARN_ON(reg == 1); |