|
|
@ -1,6 +1,6 @@ |
|
|
|
--- a/drivers/net/wireless/b43/main.c
|
|
|
|
--- a/drivers/net/wireless/b43/main.c
|
|
|
|
+++ b/drivers/net/wireless/b43/main.c
|
|
|
|
+++ b/drivers/net/wireless/b43/main.c
|
|
|
|
@@ -1556,7 +1556,7 @@ static void b43_write_beacon_template(st
|
|
|
|
@@ -1560,7 +1560,7 @@ static void b43_write_beacon_template(st
|
|
|
|
len, ram_offset, shm_size_offset, rate);
|
|
|
|
len, ram_offset, shm_size_offset, rate);
|
|
|
|
|
|
|
|
|
|
|
|
/* Write the PHY TX control parameters. */
|
|
|
|
/* Write the PHY TX control parameters. */
|
|
|
@ -9,7 +9,7 @@ |
|
|
|
antenna = b43_antenna_to_phyctl(antenna);
|
|
|
|
antenna = b43_antenna_to_phyctl(antenna);
|
|
|
|
ctl = b43_shm_read16(dev, B43_SHM_SHARED, B43_SHM_SH_BEACPHYCTL);
|
|
|
|
ctl = b43_shm_read16(dev, B43_SHM_SHARED, B43_SHM_SH_BEACPHYCTL);
|
|
|
|
/* We can't send beacons with short preamble. Would get PHY errors. */
|
|
|
|
/* We can't send beacons with short preamble. Would get PHY errors. */
|
|
|
|
@@ -3113,8 +3113,8 @@ static int b43_chip_init(struct b43_wlde
|
|
|
|
@@ -3151,8 +3151,8 @@ static int b43_chip_init(struct b43_wlde
|
|
|
|
|
|
|
|
|
|
|
|
/* Select the antennae */
|
|
|
|
/* Select the antennae */
|
|
|
|
if (phy->ops->set_rx_antenna)
|
|
|
|
if (phy->ops->set_rx_antenna)
|
|
|
@ -20,15 +20,15 @@ |
|
|
|
|
|
|
|
|
|
|
|
if (phy->type == B43_PHYTYPE_B) {
|
|
|
|
if (phy->type == B43_PHYTYPE_B) {
|
|
|
|
value16 = b43_read16(dev, 0x005E);
|
|
|
|
value16 = b43_read16(dev, 0x005E);
|
|
|
|
@@ -3806,7 +3806,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_wldev *dev = wl->current_dev;
|
|
|
|
struct b43_phy *phy;
|
|
|
|
struct b43_phy *phy = &dev->phy;
|
|
|
|
struct ieee80211_conf *conf = &hw->conf;
|
|
|
|
struct ieee80211_conf *conf = &hw->conf;
|
|
|
|
- int antenna;
|
|
|
|
- int antenna;
|
|
|
|
int err = 0;
|
|
|
|
int err = 0;
|
|
|
|
bool reload_bss = false;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@@ -3860,11 +3859,9 @@ static int b43_op_config(struct ieee8021
|
|
|
|
mutex_lock(&wl->mutex);
|
|
|
|
|
|
|
|
@@ -3886,11 +3885,9 @@ static int b43_op_config(struct ieee8021
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Antennas for RX and management frame TX. */
|
|
|
|
/* Antennas for RX and management frame TX. */
|
|
|
@ -42,7 +42,7 @@ |
|
|
|
|
|
|
|
|
|
|
|
if (wl->radio_enabled != phy->radio_on) {
|
|
|
|
if (wl->radio_enabled != phy->radio_on) {
|
|
|
|
if (wl->radio_enabled) {
|
|
|
|
if (wl->radio_enabled) {
|
|
|
|
@@ -4988,6 +4985,47 @@ static int b43_op_get_survey(struct ieee
|
|
|
|
@@ -5019,6 +5016,47 @@ static int b43_op_get_survey(struct ieee
|
|
|
|
return 0;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -90,7 +90,7 @@ |
|
|
|
static const struct ieee80211_ops b43_hw_ops = {
|
|
|
|
static const struct ieee80211_ops b43_hw_ops = {
|
|
|
|
.tx = b43_op_tx,
|
|
|
|
.tx = b43_op_tx,
|
|
|
|
.conf_tx = b43_op_conf_tx,
|
|
|
|
.conf_tx = b43_op_conf_tx,
|
|
|
|
@@ -5009,6 +5047,8 @@ static const struct ieee80211_ops b43_hw
|
|
|
|
@@ -5040,6 +5078,8 @@ static const struct ieee80211_ops b43_hw
|
|
|
|
.sw_scan_complete = b43_op_sw_scan_complete_notifier,
|
|
|
|
.sw_scan_complete = b43_op_sw_scan_complete_notifier,
|
|
|
|
.get_survey = b43_op_get_survey,
|
|
|
|
.get_survey = b43_op_get_survey,
|
|
|
|
.rfkill_poll = b43_rfkill_poll,
|
|
|
|
.rfkill_poll = b43_rfkill_poll,
|
|
|
@ -99,7 +99,7 @@ |
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/* Hard-reset the chip. Do not call this directly.
|
|
|
|
/* Hard-reset the chip. Do not call this directly.
|
|
|
|
@@ -5296,6 +5336,8 @@ static int b43_one_core_attach(struct b4
|
|
|
|
@@ -5330,6 +5370,8 @@ static int b43_one_core_attach(struct b4
|
|
|
|
if (!wldev)
|
|
|
|
if (!wldev)
|
|
|
|
goto out;
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
|
|
|
@ -108,7 +108,7 @@ |
|
|
|
wldev->use_pio = b43_modparam_pio;
|
|
|
|
wldev->use_pio = b43_modparam_pio;
|
|
|
|
wldev->dev = dev;
|
|
|
|
wldev->dev = dev;
|
|
|
|
wldev->wl = wl;
|
|
|
|
wldev->wl = wl;
|
|
|
|
@@ -5386,6 +5428,9 @@ static struct b43_wl *b43_wireless_init(
|
|
|
|
@@ -5420,6 +5462,9 @@ static struct b43_wl *b43_wireless_init(
|
|
|
|
|
|
|
|
|
|
|
|
hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN;
|
|
|
|
hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN;
|
|
|
|
|
|
|
|
|
|
|
|