dumalogiya
/
openwrt
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mac80211: b43: backport b43 patches from wireless testing

Browse Source 
This brings b43 up to wireless-testing/master master-2014-07-15

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

SVN-Revision: 41668
v19.07.3_mercusys_ac12_duma
Hauke Mehrtens 10 years ago
parent 1636bc6704
commit 025144800a
6 changed files with 1745 additions and 129 deletions
Show Stats Download Patch File Download Diff File

1838
package/kernel/mac80211/patches/800-b43-backports-form-wireless-testing-master-master-20.patch
View File

File diff suppressed because it is too large Load Diff

2
package/kernel/mac80211/patches/805-b43-gpio-mask-module-option.patch
Unescape Escape View File

@ -22,7 +22,7 @@
static int modparam_bad_frames_preempt;
module_param_named(bad_frames_preempt, modparam_bad_frames_preempt, int, 0444);
MODULE_PARM_DESC(bad_frames_preempt,
@@ -2787,10 +2792,10 @@ static int b43_gpio_init(struct b43_wlde
@@ -2798,10 +2803,10 @@ static int b43_gpio_init(struct b43_wlde
u32 mask, set;
b43_maskset32(dev, B43_MMIO_MACCTL, ~B43_MACCTL_GPOUTSMSK, 0);

2
package/kernel/mac80211/patches/810-b43_no_pio.patch
Unescape Escape View File

@ -11,7 +11,7 @@
b43-$(CPTCFG_B43_PCMCIA) += pcmcia.o
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -1913,10 +1913,12 @@ static void b43_do_interrupt_thread(stru
@@ -1924,10 +1924,12 @@ static void b43_do_interrupt_thread(stru
dma_reason[0], dma_reason[1],
dma_reason[2], dma_reason[3],
dma_reason[4], dma_reason[5]);

16
package/kernel/mac80211/patches/820-b43-add-antenna-control.patch
Unescape Escape View File

@ -1,6 +1,6 @@
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -1560,7 +1560,7 @@ static void b43_write_beacon_template(st
@@ -1571,7 +1571,7 @@ static void b43_write_beacon_template(st
len, ram_offset, shm_size_offset, rate);
/* Write the PHY TX control parameters. */
@ -9,7 +9,7 @@
antenna = b43_antenna_to_phyctl(antenna);
ctl = b43_shm_read16(dev, B43_SHM_SHARED, B43_SHM_SH_BEACPHYCTL);
/* We can't send beacons with short preamble. Would get PHY errors. */
@@ -3151,8 +3151,8 @@ static int b43_chip_init(struct b43_wlde
@@ -3162,8 +3162,8 @@ static int b43_chip_init(struct b43_wlde
/* Select the antennae */
if (phy->ops->set_rx_antenna)
@ -20,7 +20,7 @@
if (phy->type == B43_PHYTYPE_B) {
value16 = b43_read16(dev, 0x005E);
@@ -3846,7 +3846,6 @@ static int b43_op_config(struct ieee8021
@@ -3857,7 +3857,6 @@ static int b43_op_config(struct ieee8021
struct b43_wldev *dev = wl->current_dev;
struct b43_phy *phy = &dev->phy;
struct ieee80211_conf *conf = &hw->conf;
@ -28,7 +28,7 @@
int err = 0;
mutex_lock(&wl->mutex);
@@ -3886,11 +3885,9 @@ static int b43_op_config(struct ieee8021
@@ -3897,11 +3896,9 @@ static int b43_op_config(struct ieee8021
}
/* Antennas for RX and management frame TX. */
@ -42,7 +42,7 @@
if (wl->radio_enabled != phy->radio_on) {
if (wl->radio_enabled) {
@@ -5019,6 +5016,47 @@ static int b43_op_get_survey(struct ieee
@@ -5033,6 +5030,47 @@ static int b43_op_get_survey(struct ieee
return 0;
}
@ -90,7 +90,7 @@
static const struct ieee80211_ops b43_hw_ops = {
.tx = b43_op_tx,
.conf_tx = b43_op_conf_tx,
@@ -5040,6 +5078,8 @@ static const struct ieee80211_ops b43_hw
@@ -5054,6 +5092,8 @@ static const struct ieee80211_ops b43_hw
.sw_scan_complete = b43_op_sw_scan_complete_notifier,
.get_survey = b43_op_get_survey,
.rfkill_poll = b43_rfkill_poll,
@ -99,7 +99,7 @@
};
/* Hard-reset the chip. Do not call this directly.
@@ -5330,6 +5370,8 @@ static int b43_one_core_attach(struct b4
@@ -5352,6 +5392,8 @@ static int b43_one_core_attach(struct b4
if (!wldev)
goto out;
@ -108,7 +108,7 @@
wldev->use_pio = b43_modparam_pio;
wldev->dev = dev;
wldev->wl = wl;
@@ -5420,6 +5462,9 @@ static struct b43_wl *b43_wireless_init(
@@ -5442,6 +5484,9 @@ static struct b43_wl *b43_wireless_init(
hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN;

14
package/kernel/mac80211/patches/830-b43-workaround-pcie-bcm4716.patch
Unescape Escape View File

@ -74,7 +74,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
struct b43_bus_dev *b43_bus_dev_ssb_init(struct ssb_device *sdev);
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -4411,7 +4411,7 @@ static int b43_phy_versioning(struct b43
@@ -4422,7 +4422,7 @@ static int b43_phy_versioning(struct b43
u16 radio24[3];
for (tmp = 0; tmp < 3; tmp++) {
@ -83,7 +83,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
radio24[tmp] = b43_read16(dev, B43_MMIO_RADIO24_DATA);
}
@@ -4430,10 +4430,10 @@ static int b43_phy_versioning(struct b43
@@ -4441,10 +4441,10 @@ static int b43_phy_versioning(struct b43
else
tmp = 0x5205017F;
} else {
@ -199,7 +199,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
--- a/drivers/net/wireless/b43/phy_n.c
+++ b/drivers/net/wireless/b43/phy_n.c
@@ -5812,14 +5812,14 @@ static inline void check_phyreg(struct b
@@ -6251,14 +6251,14 @@ static inline void check_phyreg(struct b
static u16 b43_nphy_op_read(struct b43_wldev *dev, u16 reg)
{
check_phyreg(dev, reg);
@ -216,7 +216,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
b43_write16(dev, B43_MMIO_PHY_DATA, value);
}
@@ -5827,7 +5827,7 @@ static void b43_nphy_op_maskset(struct b
@@ -6266,7 +6266,7 @@ static void b43_nphy_op_maskset(struct b
u16 set)
{
check_phyreg(dev, reg);
@ -225,7 +225,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
b43_maskset16(dev, B43_MMIO_PHY_DATA, mask, set);
}
@@ -5841,7 +5841,7 @@ static u16 b43_nphy_op_radio_read(struct
@@ -6280,7 +6280,7 @@ static u16 b43_nphy_op_radio_read(struct
else
reg |= 0x100;
@ -234,9 +234,9 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
return b43_read16(dev, B43_MMIO_RADIO_DATA_LOW);
}
@@ -5850,7 +5850,7 @@ static void b43_nphy_op_radio_write(stru
@@ -6289,7 +6289,7 @@ static void b43_nphy_op_radio_write(stru
/* Register 1 is a 32-bit register. */
B43_WARN_ON(reg == 1);
B43_WARN_ON(dev->phy.rev < 7 && reg == 1);
- b43_write16(dev, B43_MMIO_RADIO_CONTROL, reg);
+ b43_wflush16(dev, B43_MMIO_RADIO_CONTROL, reg);

2
package/kernel/mac80211/patches/845-b43-only-use-gpio-0-1-for-led.patch
Unescape Escape View File

@ -1,6 +1,6 @@
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -2804,6 +2804,14 @@ static int b43_gpio_init(struct b43_wlde
@@ -2815,6 +2815,14 @@ static int b43_gpio_init(struct b43_wlde
} else if (dev->dev->chip_id == 0x5354) {
/* Don't allow overtaking buttons GPIOs */
set &= 0x2; /* 0x2 is LED GPIO on BCM5354 */

Write Preview
Loading…
Cancel
Save