diff options
author | Felix Fietkau <nbd@openwrt.org> | 2014-03-14 10:53:42 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2014-03-14 10:53:42 +0000 |
commit | 705d7a8aa438a21daa646e1dc8c5d0a45295de0c (patch) | |
tree | fc4abc713ed39e07d94d500e5f7d44cbc985f43e /package/mac80211/patches/820-b43-add-antenna-control.patch | |
parent | 9b1e65073a8b1a571c390a1041bfe7fcd07d97ba (diff) | |
download | upstream-705d7a8aa438a21daa646e1dc8c5d0a45295de0c.tar.gz upstream-705d7a8aa438a21daa646e1dc8c5d0a45295de0c.tar.bz2 upstream-705d7a8aa438a21daa646e1dc8c5d0a45295de0c.zip |
AA: mac80211: backport package from trunk r39886
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@39928 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/820-b43-add-antenna-control.patch')
-rw-r--r-- | package/mac80211/patches/820-b43-add-antenna-control.patch | 14 |
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 56aef894bc..dea98303cd 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. */ -@@ -3100,8 +3100,8 @@ static int b43_chip_init(struct b43_wlde +@@ -3105,8 +3105,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); -@@ -3845,7 +3845,6 @@ static int b43_op_config(struct ieee8021 +@@ -3850,7 +3850,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; -@@ -3899,11 +3898,9 @@ static int b43_op_config(struct ieee8021 +@@ -3904,11 +3903,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) { -@@ -5028,6 +5025,47 @@ static int b43_op_get_survey(struct ieee +@@ -5041,6 +5038,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, -@@ -5049,6 +5087,8 @@ static const struct ieee80211_ops b43_hw +@@ -5062,6 +5100,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. -@@ -5295,6 +5335,8 @@ static int b43_one_core_attach(struct b4 +@@ -5308,6 +5348,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; -@@ -5385,6 +5427,9 @@ static struct b43_wl *b43_wireless_init( +@@ -5398,6 +5440,9 @@ static struct b43_wl *b43_wireless_init( hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN; |