RepoMirrors/openwrt
1
0
Fork 0
mirror of git://git.openwrt.org/openwrt/openwrt.git synced 2024-12-25 16:13:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

mac80211: b43: update b43 to version master-2014-07-22

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

SVN-Revision: 41805
This commit is contained in:
Hauke Mehrtens 2014-07-22 21:42:07 +00:00
parent 0d3690a202
commit 3d5412bd06
3 changed files with 1149 additions and 186 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1305
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

14
package/kernel/mac80211/patches/820-b43-add-antenna-control.patch
View File

@ -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. */
@@ -3162,8 +3162,8 @@ static int b43_chip_init(struct b43_wlde
@@ -3201,8 +3201,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);
@@ -3857,7 +3857,6 @@ static int b43_op_config(struct ieee8021
@@ -3896,7 +3896,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);
@@ -3897,11 +3896,9 @@ static int b43_op_config(struct ieee8021
@@ -3936,11 +3935,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) {
@@ -5033,6 +5030,47 @@ static int b43_op_get_survey(struct ieee
@@ -5077,6 +5074,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,
@@ -5054,6 +5092,8 @@ static const struct ieee80211_ops b43_hw
@@ -5098,6 +5136,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.
@@ -5352,6 +5392,8 @@ static int b43_one_core_attach(struct b4
@@ -5397,6 +5437,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;
@@ -5442,6 +5484,9 @@ static struct b43_wl *b43_wireless_init(
@@ -5487,6 +5529,9 @@ static struct b43_wl *b43_wireless_init(
hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN;

16
package/kernel/mac80211/patches/830-b43-workaround-pcie-bcm4716.patch
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
@@ -4422,7 +4422,7 @@ static int b43_phy_versioning(struct b43
@@ -4464,7 +4464,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);
}
@@ -4441,10 +4441,10 @@ static int b43_phy_versioning(struct b43
@@ -4481,10 +4481,10 @@ static int b43_phy_versioning(struct b43
else
tmp = 0x5205017F;
} else {
@ -156,7 +156,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
--- a/drivers/net/wireless/b43/phy_lcn.c
+++ b/drivers/net/wireless/b43/phy_lcn.c
@@ -845,20 +845,20 @@ static void b43_phy_lcn_op_adjust_txpowe
@@ -812,20 +812,20 @@ static void b43_phy_lcn_op_adjust_txpowe
static u16 b43_phy_lcn_op_read(struct b43_wldev *dev, u16 reg)
{
@ -180,7 +180,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
b43_write16(dev, B43_MMIO_PHY_DATA,
(b43_read16(dev, B43_MMIO_PHY_DATA) & mask) | set);
}
@@ -868,14 +868,14 @@ static u16 b43_phy_lcn_op_radio_read(str
@@ -835,14 +835,14 @@ static u16 b43_phy_lcn_op_radio_read(str
/* LCN-PHY needs 0x200 for read access */
reg |= 0x200;
@ -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
@@ -6251,14 +6251,14 @@ static inline void check_phyreg(struct b
@@ -6494,14 +6494,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);
}
@@ -6266,7 +6266,7 @@ static void b43_nphy_op_maskset(struct b
@@ -6509,7 +6509,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);
}
@@ -6280,7 +6280,7 @@ static u16 b43_nphy_op_radio_read(struct
@@ -6523,7 +6523,7 @@ static u16 b43_nphy_op_radio_read(struct
else
reg |= 0x100;
@ -234,7 +234,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
return b43_read16(dev, B43_MMIO_RADIO_DATA_LOW);
}
@@ -6289,7 +6289,7 @@ static void b43_nphy_op_radio_write(stru
@@ -6532,7 +6532,7 @@ static void b43_nphy_op_radio_write(stru
/* Register 1 is a 32-bit register. */
B43_WARN_ON(dev->phy.rev < 7 && reg == 1);