mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-22 06:57:57 +00:00
e4e7c284dd
SVN-Revision: 32018
526 lines
16 KiB
Diff
526 lines
16 KiB
Diff
--- a/drivers/net/wireless/ath/ath5k/base.c
|
|
+++ b/drivers/net/wireless/ath/ath5k/base.c
|
|
@@ -2417,6 +2417,22 @@ ath5k_tx_complete_poll_work(struct work_
|
|
* Initialization routines *
|
|
\*************************/
|
|
|
|
+static const struct ieee80211_iface_limit if_limits[] = {
|
|
+ { .max = 2048, .types = BIT(NL80211_IFTYPE_STATION) },
|
|
+ { .max = 4, .types =
|
|
+#ifdef CONFIG_MAC80211_MESH
|
|
+ BIT(NL80211_IFTYPE_MESH_POINT) |
|
|
+#endif
|
|
+ BIT(NL80211_IFTYPE_AP) },
|
|
+};
|
|
+
|
|
+static const struct ieee80211_iface_combination if_comb = {
|
|
+ .limits = if_limits,
|
|
+ .n_limits = ARRAY_SIZE(if_limits),
|
|
+ .max_interfaces = 2048,
|
|
+ .num_different_channels = 1,
|
|
+};
|
|
+
|
|
int __devinit
|
|
ath5k_init_ah(struct ath5k_hw *ah, const struct ath_bus_ops *bus_ops)
|
|
{
|
|
@@ -2438,6 +2454,9 @@ ath5k_init_ah(struct ath5k_hw *ah, const
|
|
BIT(NL80211_IFTYPE_ADHOC) |
|
|
BIT(NL80211_IFTYPE_MESH_POINT);
|
|
|
|
+ hw->wiphy->iface_combinations = &if_comb;
|
|
+ hw->wiphy->n_iface_combinations = 1;
|
|
+
|
|
/* SW support for IBSS_RSN is provided by mac80211 */
|
|
hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN;
|
|
|
|
--- a/net/mac80211/agg-rx.c
|
|
+++ b/net/mac80211/agg-rx.c
|
|
@@ -145,15 +145,20 @@ static void sta_rx_agg_session_timer_exp
|
|
struct tid_ampdu_rx *tid_rx;
|
|
unsigned long timeout;
|
|
|
|
+ rcu_read_lock();
|
|
tid_rx = rcu_dereference(sta->ampdu_mlme.tid_rx[*ptid]);
|
|
- if (!tid_rx)
|
|
+ if (!tid_rx) {
|
|
+ rcu_read_unlock();
|
|
return;
|
|
+ }
|
|
|
|
timeout = tid_rx->last_rx + TU_TO_JIFFIES(tid_rx->timeout);
|
|
if (time_is_after_jiffies(timeout)) {
|
|
mod_timer(&tid_rx->session_timer, timeout);
|
|
+ rcu_read_unlock();
|
|
return;
|
|
}
|
|
+ rcu_read_unlock();
|
|
|
|
#ifdef CONFIG_MAC80211_HT_DEBUG
|
|
printk(KERN_DEBUG "rx session timer expired on tid %d\n", (u16)*ptid);
|
|
@@ -200,6 +205,8 @@ static void ieee80211_send_addba_resp(st
|
|
memcpy(mgmt->bssid, sdata->u.mgd.bssid, ETH_ALEN);
|
|
else if (sdata->vif.type == NL80211_IFTYPE_ADHOC)
|
|
memcpy(mgmt->bssid, sdata->u.ibss.bssid, ETH_ALEN);
|
|
+ else if (sdata->vif.type == NL80211_IFTYPE_WDS)
|
|
+ memcpy(mgmt->bssid, da, ETH_ALEN);
|
|
|
|
mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |
|
|
IEEE80211_STYPE_ACTION);
|
|
--- a/net/mac80211/agg-tx.c
|
|
+++ b/net/mac80211/agg-tx.c
|
|
@@ -81,7 +81,8 @@ static void ieee80211_send_addba_request
|
|
memcpy(mgmt->sa, sdata->vif.addr, ETH_ALEN);
|
|
if (sdata->vif.type == NL80211_IFTYPE_AP ||
|
|
sdata->vif.type == NL80211_IFTYPE_AP_VLAN ||
|
|
- sdata->vif.type == NL80211_IFTYPE_MESH_POINT)
|
|
+ sdata->vif.type == NL80211_IFTYPE_MESH_POINT ||
|
|
+ sdata->vif.type == NL80211_IFTYPE_WDS)
|
|
memcpy(mgmt->bssid, sdata->vif.addr, ETH_ALEN);
|
|
else if (sdata->vif.type == NL80211_IFTYPE_STATION)
|
|
memcpy(mgmt->bssid, sdata->u.mgd.bssid, ETH_ALEN);
|
|
@@ -490,6 +491,7 @@ int ieee80211_start_tx_ba_session(struct
|
|
sdata->vif.type != NL80211_IFTYPE_MESH_POINT &&
|
|
sdata->vif.type != NL80211_IFTYPE_AP_VLAN &&
|
|
sdata->vif.type != NL80211_IFTYPE_AP &&
|
|
+ sdata->vif.type != NL80211_IFTYPE_WDS &&
|
|
sdata->vif.type != NL80211_IFTYPE_ADHOC)
|
|
return -EINVAL;
|
|
|
|
--- a/net/mac80211/debugfs_sta.c
|
|
+++ b/net/mac80211/debugfs_sta.c
|
|
@@ -63,11 +63,11 @@ static ssize_t sta_flags_read(struct fil
|
|
test_sta_flag(sta, WLAN_STA_##flg) ? #flg "\n" : ""
|
|
|
|
int res = scnprintf(buf, sizeof(buf),
|
|
- "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
|
|
+ "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
|
|
TEST(AUTH), TEST(ASSOC), TEST(PS_STA),
|
|
TEST(PS_DRIVER), TEST(AUTHORIZED),
|
|
TEST(SHORT_PREAMBLE),
|
|
- TEST(WME), TEST(WDS), TEST(CLEAR_PS_FILT),
|
|
+ TEST(WME), TEST(CLEAR_PS_FILT),
|
|
TEST(MFP), TEST(BLOCK_BA), TEST(PSPOLL),
|
|
TEST(UAPSD), TEST(SP), TEST(TDLS_PEER),
|
|
TEST(TDLS_PEER_AUTH), TEST(4ADDR_EVENT),
|
|
--- a/net/mac80211/iface.c
|
|
+++ b/net/mac80211/iface.c
|
|
@@ -284,7 +284,6 @@ static int ieee80211_do_open(struct net_
|
|
{
|
|
struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
|
|
struct ieee80211_local *local = sdata->local;
|
|
- struct sta_info *sta;
|
|
u32 changed = 0;
|
|
int res;
|
|
u32 hw_reconf_flags = 0;
|
|
@@ -430,28 +429,6 @@ static int ieee80211_do_open(struct net_
|
|
|
|
set_bit(SDATA_STATE_RUNNING, &sdata->state);
|
|
|
|
- if (sdata->vif.type == NL80211_IFTYPE_WDS) {
|
|
- /* Create STA entry for the WDS peer */
|
|
- sta = sta_info_alloc(sdata, sdata->u.wds.remote_addr,
|
|
- GFP_KERNEL);
|
|
- if (!sta) {
|
|
- res = -ENOMEM;
|
|
- goto err_del_interface;
|
|
- }
|
|
-
|
|
- sta_info_pre_move_state(sta, IEEE80211_STA_AUTH);
|
|
- sta_info_pre_move_state(sta, IEEE80211_STA_ASSOC);
|
|
- sta_info_pre_move_state(sta, IEEE80211_STA_AUTHORIZED);
|
|
-
|
|
- res = sta_info_insert(sta);
|
|
- if (res) {
|
|
- /* STA has been freed */
|
|
- goto err_del_interface;
|
|
- }
|
|
-
|
|
- rate_control_rate_init(sta);
|
|
- }
|
|
-
|
|
/*
|
|
* set_multicast_list will be invoked by the networking core
|
|
* which will check whether any increments here were done in
|
|
@@ -642,6 +619,8 @@ static void ieee80211_do_stop(struct iee
|
|
ieee80211_configure_filter(local);
|
|
break;
|
|
default:
|
|
+ flush_work(&local->hw_roc_start);
|
|
+ flush_work(&local->hw_roc_done);
|
|
flush_work(&sdata->work);
|
|
/*
|
|
* When we get here, the interface is marked down.
|
|
@@ -848,6 +827,72 @@ static void ieee80211_if_setup(struct ne
|
|
dev->destructor = free_netdev;
|
|
}
|
|
|
|
+static void ieee80211_wds_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata,
|
|
+ struct sk_buff *skb)
|
|
+{
|
|
+ struct ieee80211_local *local = sdata->local;
|
|
+ struct ieee80211_rx_status *rx_status;
|
|
+ struct ieee802_11_elems elems;
|
|
+ struct ieee80211_mgmt *mgmt;
|
|
+ struct sta_info *sta;
|
|
+ size_t baselen;
|
|
+ u32 rates = 0;
|
|
+ u16 stype;
|
|
+ bool new = false;
|
|
+ enum ieee80211_band band = local->hw.conf.channel->band;
|
|
+ struct ieee80211_supported_band *sband = local->hw.wiphy->bands[band];
|
|
+
|
|
+ rx_status = IEEE80211_SKB_RXCB(skb);
|
|
+ mgmt = (struct ieee80211_mgmt *) skb->data;
|
|
+ stype = le16_to_cpu(mgmt->frame_control) & IEEE80211_FCTL_STYPE;
|
|
+
|
|
+ if (stype != IEEE80211_STYPE_BEACON)
|
|
+ return;
|
|
+
|
|
+ baselen = (u8 *) mgmt->u.probe_resp.variable - (u8 *) mgmt;
|
|
+ if (baselen > skb->len)
|
|
+ return;
|
|
+
|
|
+ ieee802_11_parse_elems(mgmt->u.probe_resp.variable,
|
|
+ skb->len - baselen, &elems);
|
|
+
|
|
+ rates = ieee80211_sta_get_rates(local, &elems, band, NULL);
|
|
+
|
|
+ rcu_read_lock();
|
|
+
|
|
+ sta = sta_info_get(sdata, sdata->u.wds.remote_addr);
|
|
+
|
|
+ if (!sta) {
|
|
+ rcu_read_unlock();
|
|
+ sta = sta_info_alloc(sdata, sdata->u.wds.remote_addr,
|
|
+ GFP_KERNEL);
|
|
+ if (!sta)
|
|
+ return;
|
|
+
|
|
+ new = true;
|
|
+ }
|
|
+
|
|
+ sta->last_rx = jiffies;
|
|
+ sta->sta.supp_rates[local->hw.conf.channel->band] = rates;
|
|
+
|
|
+ if (elems.ht_cap_elem)
|
|
+ ieee80211_ht_cap_ie_to_sta_ht_cap(sdata, sband,
|
|
+ elems.ht_cap_elem, &sta->sta.ht_cap);
|
|
+
|
|
+ if (elems.wmm_param)
|
|
+ set_sta_flag(sta, WLAN_STA_WME);
|
|
+
|
|
+ if (new) {
|
|
+ sta_info_pre_move_state(sta, IEEE80211_STA_AUTH);
|
|
+ sta_info_pre_move_state(sta, IEEE80211_STA_ASSOC);
|
|
+ sta_info_pre_move_state(sta, IEEE80211_STA_AUTHORIZED);
|
|
+ rate_control_rate_init(sta);
|
|
+ sta_info_insert_rcu(sta);
|
|
+ }
|
|
+
|
|
+ rcu_read_unlock();
|
|
+}
|
|
+
|
|
static void ieee80211_iface_work(struct work_struct *work)
|
|
{
|
|
struct ieee80211_sub_if_data *sdata =
|
|
@@ -952,6 +997,9 @@ static void ieee80211_iface_work(struct
|
|
break;
|
|
ieee80211_mesh_rx_queued_mgmt(sdata, skb);
|
|
break;
|
|
+ case NL80211_IFTYPE_WDS:
|
|
+ ieee80211_wds_rx_queued_mgmt(sdata, skb);
|
|
+ break;
|
|
default:
|
|
WARN(1, "frame for unexpected interface type");
|
|
break;
|
|
--- a/net/mac80211/rx.c
|
|
+++ b/net/mac80211/rx.c
|
|
@@ -2284,6 +2284,7 @@ ieee80211_rx_h_action(struct ieee80211_r
|
|
sdata->vif.type != NL80211_IFTYPE_MESH_POINT &&
|
|
sdata->vif.type != NL80211_IFTYPE_AP_VLAN &&
|
|
sdata->vif.type != NL80211_IFTYPE_AP &&
|
|
+ sdata->vif.type != NL80211_IFTYPE_WDS &&
|
|
sdata->vif.type != NL80211_IFTYPE_ADHOC)
|
|
break;
|
|
|
|
@@ -2498,14 +2499,15 @@ ieee80211_rx_h_mgmt(struct ieee80211_rx_
|
|
|
|
if (!ieee80211_vif_is_mesh(&sdata->vif) &&
|
|
sdata->vif.type != NL80211_IFTYPE_ADHOC &&
|
|
- sdata->vif.type != NL80211_IFTYPE_STATION)
|
|
+ sdata->vif.type != NL80211_IFTYPE_STATION &&
|
|
+ sdata->vif.type != NL80211_IFTYPE_WDS)
|
|
return RX_DROP_MONITOR;
|
|
|
|
switch (stype) {
|
|
case cpu_to_le16(IEEE80211_STYPE_AUTH):
|
|
case cpu_to_le16(IEEE80211_STYPE_BEACON):
|
|
case cpu_to_le16(IEEE80211_STYPE_PROBE_RESP):
|
|
- /* process for all: mesh, mlme, ibss */
|
|
+ /* process for all: mesh, mlme, ibss, wds */
|
|
break;
|
|
case cpu_to_le16(IEEE80211_STYPE_ASSOC_RESP):
|
|
case cpu_to_le16(IEEE80211_STYPE_REASSOC_RESP):
|
|
@@ -2839,10 +2841,16 @@ static int prepare_for_handlers(struct i
|
|
}
|
|
break;
|
|
case NL80211_IFTYPE_WDS:
|
|
- if (bssid || !ieee80211_is_data(hdr->frame_control))
|
|
- return 0;
|
|
if (compare_ether_addr(sdata->u.wds.remote_addr, hdr->addr2))
|
|
return 0;
|
|
+
|
|
+ if (ieee80211_is_data(hdr->frame_control) ||
|
|
+ ieee80211_is_action(hdr->frame_control)) {
|
|
+ if (compare_ether_addr(sdata->vif.addr, hdr->addr1))
|
|
+ return 0;
|
|
+ } else if (!ieee80211_is_beacon(hdr->frame_control))
|
|
+ return 0;
|
|
+
|
|
break;
|
|
default:
|
|
/* should never get here */
|
|
--- a/net/mac80211/sta_info.h
|
|
+++ b/net/mac80211/sta_info.h
|
|
@@ -32,7 +32,6 @@
|
|
* @WLAN_STA_SHORT_PREAMBLE: Station is capable of receiving short-preamble
|
|
* frames.
|
|
* @WLAN_STA_WME: Station is a QoS-STA.
|
|
- * @WLAN_STA_WDS: Station is one of our WDS peers.
|
|
* @WLAN_STA_CLEAR_PS_FILT: Clear PS filter in hardware (using the
|
|
* IEEE80211_TX_CTL_CLEAR_PS_FILT control flag) when the next
|
|
* frame to this station is transmitted.
|
|
@@ -64,7 +63,6 @@ enum ieee80211_sta_info_flags {
|
|
WLAN_STA_AUTHORIZED,
|
|
WLAN_STA_SHORT_PREAMBLE,
|
|
WLAN_STA_WME,
|
|
- WLAN_STA_WDS,
|
|
WLAN_STA_CLEAR_PS_FILT,
|
|
WLAN_STA_MFP,
|
|
WLAN_STA_BLOCK_BA,
|
|
--- a/net/mac80211/util.c
|
|
+++ b/net/mac80211/util.c
|
|
@@ -804,7 +804,7 @@ void ieee80211_set_wmm_default(struct ie
|
|
struct ieee80211_local *local = sdata->local;
|
|
struct ieee80211_tx_queue_params qparam;
|
|
int ac;
|
|
- bool use_11b;
|
|
+ bool use_11b, enable_qos;
|
|
int aCWmin, aCWmax;
|
|
|
|
if (!local->ops->conf_tx)
|
|
@@ -818,6 +818,13 @@ void ieee80211_set_wmm_default(struct ie
|
|
use_11b = (local->hw.conf.channel->band == IEEE80211_BAND_2GHZ) &&
|
|
!(sdata->flags & IEEE80211_SDATA_OPERATING_GMODE);
|
|
|
|
+ /*
|
|
+ * By default disable QoS in STA mode for old access points, which do
|
|
+ * not support 802.11e. New APs will provide proper queue parameters,
|
|
+ * that we will configure later.
|
|
+ */
|
|
+ enable_qos = (sdata->vif.type != NL80211_IFTYPE_STATION);
|
|
+
|
|
for (ac = 0; ac < IEEE80211_NUM_ACS; ac++) {
|
|
/* Set defaults according to 802.11-2007 Table 7-37 */
|
|
aCWmax = 1023;
|
|
@@ -826,38 +833,47 @@ void ieee80211_set_wmm_default(struct ie
|
|
else
|
|
aCWmin = 15;
|
|
|
|
- switch (ac) {
|
|
- case IEEE80211_AC_BK:
|
|
- qparam.cw_max = aCWmax;
|
|
- qparam.cw_min = aCWmin;
|
|
- qparam.txop = 0;
|
|
- qparam.aifs = 7;
|
|
- break;
|
|
- default: /* never happens but let's not leave undefined */
|
|
- case IEEE80211_AC_BE:
|
|
+ if (enable_qos) {
|
|
+ switch (ac) {
|
|
+ case IEEE80211_AC_BK:
|
|
+ qparam.cw_max = aCWmax;
|
|
+ qparam.cw_min = aCWmin;
|
|
+ qparam.txop = 0;
|
|
+ qparam.aifs = 7;
|
|
+ break;
|
|
+ /* never happens but let's not leave undefined */
|
|
+ default:
|
|
+ case IEEE80211_AC_BE:
|
|
+ qparam.cw_max = aCWmax;
|
|
+ qparam.cw_min = aCWmin;
|
|
+ qparam.txop = 0;
|
|
+ qparam.aifs = 3;
|
|
+ break;
|
|
+ case IEEE80211_AC_VI:
|
|
+ qparam.cw_max = aCWmin;
|
|
+ qparam.cw_min = (aCWmin + 1) / 2 - 1;
|
|
+ if (use_11b)
|
|
+ qparam.txop = 6016/32;
|
|
+ else
|
|
+ qparam.txop = 3008/32;
|
|
+ qparam.aifs = 2;
|
|
+ break;
|
|
+ case IEEE80211_AC_VO:
|
|
+ qparam.cw_max = (aCWmin + 1) / 2 - 1;
|
|
+ qparam.cw_min = (aCWmin + 1) / 4 - 1;
|
|
+ if (use_11b)
|
|
+ qparam.txop = 3264/32;
|
|
+ else
|
|
+ qparam.txop = 1504/32;
|
|
+ qparam.aifs = 2;
|
|
+ break;
|
|
+ }
|
|
+ } else {
|
|
+ /* Confiure old 802.11b/g medium access rules. */
|
|
qparam.cw_max = aCWmax;
|
|
qparam.cw_min = aCWmin;
|
|
qparam.txop = 0;
|
|
- qparam.aifs = 3;
|
|
- break;
|
|
- case IEEE80211_AC_VI:
|
|
- qparam.cw_max = aCWmin;
|
|
- qparam.cw_min = (aCWmin + 1) / 2 - 1;
|
|
- if (use_11b)
|
|
- qparam.txop = 6016/32;
|
|
- else
|
|
- qparam.txop = 3008/32;
|
|
qparam.aifs = 2;
|
|
- break;
|
|
- case IEEE80211_AC_VO:
|
|
- qparam.cw_max = (aCWmin + 1) / 2 - 1;
|
|
- qparam.cw_min = (aCWmin + 1) / 4 - 1;
|
|
- if (use_11b)
|
|
- qparam.txop = 3264/32;
|
|
- else
|
|
- qparam.txop = 1504/32;
|
|
- qparam.aifs = 2;
|
|
- break;
|
|
}
|
|
|
|
qparam.uapsd = false;
|
|
@@ -866,12 +882,8 @@ void ieee80211_set_wmm_default(struct ie
|
|
drv_conf_tx(local, sdata, ac, &qparam);
|
|
}
|
|
|
|
- /* after reinitialize QoS TX queues setting to default,
|
|
- * disable QoS at all */
|
|
-
|
|
if (sdata->vif.type != NL80211_IFTYPE_MONITOR) {
|
|
- sdata->vif.bss_conf.qos =
|
|
- sdata->vif.type != NL80211_IFTYPE_STATION;
|
|
+ sdata->vif.bss_conf.qos = enable_qos;
|
|
if (bss_notify)
|
|
ieee80211_bss_info_change_notify(sdata,
|
|
BSS_CHANGED_QOS);
|
|
--- a/drivers/net/wireless/ath/ath9k/beacon.c
|
|
+++ b/drivers/net/wireless/ath/ath9k/beacon.c
|
|
@@ -48,7 +48,10 @@ int ath_beaconq_config(struct ath_softc
|
|
txq = sc->tx.txq_map[WME_AC_BE];
|
|
ath9k_hw_get_txq_props(ah, txq->axq_qnum, &qi_be);
|
|
qi.tqi_aifs = qi_be.tqi_aifs;
|
|
- qi.tqi_cwmin = 4*qi_be.tqi_cwmin;
|
|
+ if (ah->slottime == ATH9K_SLOT_TIME_20)
|
|
+ qi.tqi_cwmin = 2*qi_be.tqi_cwmin;
|
|
+ else
|
|
+ qi.tqi_cwmin = 4*qi_be.tqi_cwmin;
|
|
qi.tqi_cwmax = qi_be.tqi_cwmax;
|
|
}
|
|
|
|
--- a/net/mac80211/mlme.c
|
|
+++ b/net/mac80211/mlme.c
|
|
@@ -1220,6 +1220,22 @@ static void ieee80211_sta_wmm_params(str
|
|
sdata->vif.bss_conf.qos = true;
|
|
}
|
|
|
|
+static void __ieee80211_stop_poll(struct ieee80211_sub_if_data *sdata)
|
|
+{
|
|
+ lockdep_assert_held(&sdata->local->mtx);
|
|
+
|
|
+ sdata->u.mgd.flags &= ~(IEEE80211_STA_CONNECTION_POLL |
|
|
+ IEEE80211_STA_BEACON_POLL);
|
|
+ ieee80211_run_deferred_scan(sdata->local);
|
|
+}
|
|
+
|
|
+static void ieee80211_stop_poll(struct ieee80211_sub_if_data *sdata)
|
|
+{
|
|
+ mutex_lock(&sdata->local->mtx);
|
|
+ __ieee80211_stop_poll(sdata);
|
|
+ mutex_unlock(&sdata->local->mtx);
|
|
+}
|
|
+
|
|
static u32 ieee80211_handle_bss_capability(struct ieee80211_sub_if_data *sdata,
|
|
u16 capab, bool erp_valid, u8 erp)
|
|
{
|
|
@@ -1285,8 +1301,7 @@ static void ieee80211_set_associated(str
|
|
sdata->u.mgd.flags |= IEEE80211_STA_RESET_SIGNAL_AVE;
|
|
|
|
/* just to be sure */
|
|
- sdata->u.mgd.flags &= ~(IEEE80211_STA_CONNECTION_POLL |
|
|
- IEEE80211_STA_BEACON_POLL);
|
|
+ ieee80211_stop_poll(sdata);
|
|
|
|
ieee80211_led_assoc(local, 1);
|
|
|
|
@@ -1456,8 +1471,7 @@ static void ieee80211_reset_ap_probe(str
|
|
return;
|
|
}
|
|
|
|
- ifmgd->flags &= ~(IEEE80211_STA_CONNECTION_POLL |
|
|
- IEEE80211_STA_BEACON_POLL);
|
|
+ __ieee80211_stop_poll(sdata);
|
|
|
|
mutex_lock(&local->iflist_mtx);
|
|
ieee80211_recalc_ps(local, -1);
|
|
@@ -1477,7 +1491,6 @@ static void ieee80211_reset_ap_probe(str
|
|
round_jiffies_up(jiffies +
|
|
IEEE80211_CONNECTION_IDLE_TIME));
|
|
out:
|
|
- ieee80211_run_deferred_scan(local);
|
|
mutex_unlock(&local->mtx);
|
|
}
|
|
|
|
@@ -2413,7 +2426,11 @@ static void ieee80211_rx_mgmt_beacon(str
|
|
"to a received beacon\n", sdata->name);
|
|
}
|
|
#endif
|
|
+ mutex_lock(&local->mtx);
|
|
ifmgd->flags &= ~IEEE80211_STA_BEACON_POLL;
|
|
+ ieee80211_run_deferred_scan(local);
|
|
+ mutex_unlock(&local->mtx);
|
|
+
|
|
mutex_lock(&local->iflist_mtx);
|
|
ieee80211_recalc_ps(local, -1);
|
|
mutex_unlock(&local->iflist_mtx);
|
|
@@ -2600,8 +2617,7 @@ static void ieee80211_sta_connection_los
|
|
struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
|
|
u8 frame_buf[DEAUTH_DISASSOC_LEN];
|
|
|
|
- ifmgd->flags &= ~(IEEE80211_STA_CONNECTION_POLL |
|
|
- IEEE80211_STA_BEACON_POLL);
|
|
+ ieee80211_stop_poll(sdata);
|
|
|
|
ieee80211_set_disassoc(sdata, IEEE80211_STYPE_DEAUTH, reason,
|
|
false, frame_buf);
|
|
@@ -2879,8 +2895,7 @@ static void ieee80211_restart_sta_timer(
|
|
u32 flags;
|
|
|
|
if (sdata->vif.type == NL80211_IFTYPE_STATION) {
|
|
- sdata->u.mgd.flags &= ~(IEEE80211_STA_BEACON_POLL |
|
|
- IEEE80211_STA_CONNECTION_POLL);
|
|
+ __ieee80211_stop_poll(sdata);
|
|
|
|
/* let's probe the connection once */
|
|
flags = sdata->local->hw.flags;
|
|
@@ -2949,7 +2964,10 @@ void ieee80211_sta_restart(struct ieee80
|
|
if (test_and_clear_bit(TMR_RUNNING_CHANSW, &ifmgd->timers_running))
|
|
add_timer(&ifmgd->chswitch_timer);
|
|
ieee80211_sta_reset_beacon_monitor(sdata);
|
|
+
|
|
+ mutex_lock(&sdata->local->mtx);
|
|
ieee80211_restart_sta_timer(sdata);
|
|
+ mutex_unlock(&sdata->local->mtx);
|
|
}
|
|
#endif
|
|
|