qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-04-21 12:27:27 +03:00
Code Activity

mac80211: update to 2012-09-07, adds ath9k beacon fixes, mesh/adhoc fixes, and more

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33331 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd
2012-09-08 11:10:54 +00:00
parent 08b17128a1
commit de017af48d
54 changed files with 385 additions and 4736 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
package/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. */
@@ -3046,8 +3046,8 @@ static int b43_chip_init(struct b43_wlde
@@ -3049,8 +3049,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);
@@ -3790,7 +3790,6 @@ static int b43_op_config(struct ieee8021
@@ -3794,7 +3794,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;
@@ -3844,11 +3843,9 @@ static int b43_op_config(struct ieee8021
@@ -3848,11 +3847,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) {
@@ -4941,6 +4938,47 @@ static int b43_op_get_survey(struct ieee
@@ -4974,6 +4971,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,
@@ -4962,6 +5000,8 @@ static const struct ieee80211_ops b43_hw
@@ -4995,6 +5033,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.
@@ -5208,6 +5248,8 @@ static int b43_one_core_attach(struct b4
@@ -5241,6 +5281,8 @@ static int b43_one_core_attach(struct b4
if (!wldev)
goto out;
@@ -108,19 +108,19 @@
wldev->use_pio = b43_modparam_pio;
wldev->dev = dev;
wldev->wl = wl;
@@ -5298,6 +5340,9 @@ static struct b43_wl *b43_wireless_init(
@@ -5331,6 +5373,9 @@ static struct b43_wl *b43_wireless_init(
hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN;
+ hw->wiphy->available_antennas_rx = 0x3;
+ hw->wiphy->available_antennas_tx = 0x3;
+
hw->queues = modparam_qos ? B43_QOS_QUEUE_NUM : 1;
wl->mac80211_initially_registered_queues = hw->queues;
wl->hw_registred = false;
hw->max_rates = 2;
SET_IEEE80211_DEV(hw, dev->dev);
--- a/drivers/net/wireless/b43/b43.h
+++ b/drivers/net/wireless/b43/b43.h
@@ -804,6 +804,8 @@ struct b43_wldev {
@@ -808,6 +808,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 */