diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2013-01-09 12:45:28 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2013-01-09 12:45:28 +0000 |
| commit | 5c9fd3b2d26012f8b77d1f5c86bf0b9223460cf4 (patch) | |
| tree | 3b9cc236acb707d3a563f84f91f5d7fc6c183bd4 /package/mac80211/patches/820-b43-add-antenna-control.patch | |
| parent | 4834d09a3f91622bb78e2163181a976933a96c43 (diff) | |
| download | upstream-5c9fd3b2d26012f8b77d1f5c86bf0b9223460cf4.tar.gz upstream-5c9fd3b2d26012f8b77d1f5c86bf0b9223460cf4.tar.bz2 upstream-5c9fd3b2d26012f8b77d1f5c86bf0b9223460cf4.zip | |
mac80211: update to 2013-01-07, add several ath9k stability fixes
SVN-Revision: 35063
Diffstat (limited to 'package/mac80211/patches/820-b43-add-antenna-control.patch')
| -rw-r--r-- | package/mac80211/patches/820-b43-add-antenna-control.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/package/mac80211/patches/820-b43-add-antenna-control.patch b/package/mac80211/patches/820-b43-add-antenna-control.patch index a2a3873fc5..8b6255f2c0 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. */ -@@ -3073,8 +3073,8 @@ static int b43_chip_init(struct b43_wlde +@@ -3101,8 +3101,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); -@@ -3818,7 +3818,6 @@ static int b43_op_config(struct ieee8021 +@@ -3846,7 +3846,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; -@@ -3872,11 +3871,9 @@ static int b43_op_config(struct ieee8021 +@@ -3900,11 +3899,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) { -@@ -5002,6 +4999,47 @@ static int b43_op_get_survey(struct ieee +@@ -5030,6 +5027,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, -@@ -5023,6 +5061,8 @@ static const struct ieee80211_ops b43_hw +@@ -5051,6 +5089,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. -@@ -5269,6 +5309,8 @@ static int b43_one_core_attach(struct b4 +@@ -5297,6 +5337,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; -@@ -5359,6 +5401,9 @@ static struct b43_wl *b43_wireless_init( +@@ -5387,6 +5429,9 @@ static struct b43_wl *b43_wireless_init( hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN; @@ -120,7 +120,7 @@ SET_IEEE80211_DEV(hw, dev->dev); --- a/drivers/net/wireless/b43/b43.h +++ b/drivers/net/wireless/b43/b43.h -@@ -808,6 +808,8 @@ struct b43_wldev { +@@ -813,6 +813,8 @@ struct b43_wldev { bool hwcrypto_enabled; /* TRUE, if HW crypto acceleration is enabled. */ bool use_pio; /* TRUE if next init should use PIO */ int gpiomask; /* GPIO LED mask as a module parameter */ |