aboutsummaryrefslogtreecommitdiffstats
path: root/package/mac80211/patches/820-b43-add-antenna-control.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2013-06-15 20:14:06 +0000
committerFelix Fietkau <nbd@openwrt.org>2013-06-15 20:14:06 +0000
commit5ca4d24cd1043e142515ac66c44a26a2371978d3 (patch)
treef7411ae4df9fed440179fab0be52e2f1640544ed /package/mac80211/patches/820-b43-add-antenna-control.patch
parentd3a7b5633c7c1ea142cb8c0872cab484ca385c92 (diff)
downloadupstream-5ca4d24cd1043e142515ac66c44a26a2371978d3.tar.gz
upstream-5ca4d24cd1043e142515ac66c44a26a2371978d3.tar.bz2
upstream-5ca4d24cd1043e142515ac66c44a26a2371978d3.zip
mac80211: update to wireless-testing 2013-06-13 + latest backport infrastructure
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 36939
Diffstat (limited to 'package/mac80211/patches/820-b43-add-antenna-control.patch')
-rw-r--r--package/mac80211/patches/820-b43-add-antenna-control.patch14
1 files changed, 7 insertions, 7 deletions
diff --git a/package/mac80211/patches/820-b43-add-antenna-control.patch b/package/mac80211/patches/820-b43-add-antenna-control.patch
index 272eee4757..c17c1ca0a9 100644
--- a/package/mac80211/patches/820-b43-add-antenna-control.patch
+++ b/package/mac80211/patches/820-b43-add-antenna-control.patch
@@ -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. */
-@@ -3105,8 +3105,8 @@ static int b43_chip_init(struct b43_wlde
+@@ -3098,8 +3098,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);
-@@ -3850,7 +3850,6 @@ static int b43_op_config(struct ieee8021
+@@ -3843,7 +3843,6 @@ static int b43_op_config(struct ieee8021
struct b43_wldev *dev;
struct b43_phy *phy;
struct ieee80211_conf *conf = &hw->conf;
@@ -28,7 +28,7 @@
int err = 0;
bool reload_bss = false;
-@@ -3904,11 +3903,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) {
-@@ -5033,6 +5030,47 @@ static int b43_op_get_survey(struct ieee
+@@ -5026,6 +5023,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
+@@ -5047,6 +5085,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.
-@@ -5300,6 +5340,8 @@ static int b43_one_core_attach(struct b4
+@@ -5293,6 +5333,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;
-@@ -5390,6 +5432,9 @@ static struct b43_wl *b43_wireless_init(
+@@ -5383,6 +5425,9 @@ static struct b43_wl *b43_wireless_init(
hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN;