diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2013-09-29 19:42:00 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2013-09-29 19:42:00 +0000 |
| commit | 9d4b0c659389cc6243fe1d52f347a0d63fe462cf (patch) | |
| tree | 281107c997976137e74a3842869be4b993ae22d5 /package/kernel/mac80211 | |
| parent | c3de6bd67e84b2569007fe3b97976c6da2370622 (diff) | |
| download | upstream-9d4b0c659389cc6243fe1d52f347a0d63fe462cf.tar.gz upstream-9d4b0c659389cc6243fe1d52f347a0d63fe462cf.tar.bz2 upstream-9d4b0c659389cc6243fe1d52f347a0d63fe462cf.zip | |
mac80211: add AP inactivity handling / probing fixes to improve stability
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38257 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel/mac80211')
| -rw-r--r-- | package/kernel/mac80211/patches/300-pending_work.patch | 35 |
1 files changed, 33 insertions, 2 deletions
diff --git a/package/kernel/mac80211/patches/300-pending_work.patch b/package/kernel/mac80211/patches/300-pending_work.patch index 2a96b6adaf..95e87fa84c 100644 --- a/package/kernel/mac80211/patches/300-pending_work.patch +++ b/package/kernel/mac80211/patches/300-pending_work.patch @@ -5110,6 +5110,15 @@ static int ieee80211_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev, struct ieee80211_channel *chan, bool offchan, unsigned int wait, const u8 *buf, size_t len, +@@ -3332,7 +3514,7 @@ static int ieee80211_probe_client(struct + return -EINVAL; + } + band = chanctx_conf->def.chan->band; +- sta = sta_info_get(sdata, peer); ++ sta = sta_info_get_bss(sdata, peer); + if (sta) { + qos = test_sta_flag(sta, WLAN_STA_WME); + } else { @@ -3501,4 +3683,5 @@ struct cfg80211_ops mac80211_config_ops .get_et_strings = ieee80211_get_et_strings, .get_channel = ieee80211_cfg_get_channel, @@ -5304,7 +5313,17 @@ #define TRACE_SYSTEM mac80211_msg --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c -@@ -2326,6 +2326,81 @@ static int ieee80211_beacon_add_tim(stru +@@ -1101,7 +1101,8 @@ ieee80211_tx_prepare(struct ieee80211_su + tx->sta = rcu_dereference(sdata->u.vlan.sta); + if (!tx->sta && sdata->dev->ieee80211_ptr->use_4addr) + return TX_DROP; +- } else if (info->flags & IEEE80211_TX_CTL_INJECTED || ++ } else if (info->flags & (IEEE80211_TX_CTL_INJECTED | ++ IEEE80211_TX_INTFL_NL80211_FRAME_TX) || + tx->sdata->control_port_protocol == tx->skb->protocol) { + tx->sta = sta_info_get_bss(sdata, hdr->addr1); + } +@@ -2326,6 +2327,81 @@ static int ieee80211_beacon_add_tim(stru return 0; } @@ -5386,7 +5405,7 @@ struct sk_buff *ieee80211_beacon_get_tim(struct ieee80211_hw *hw, struct ieee80211_vif *vif, u16 *tim_offset, u16 *tim_length) -@@ -2356,6 +2431,9 @@ struct sk_buff *ieee80211_beacon_get_tim +@@ -2356,6 +2432,9 @@ struct sk_buff *ieee80211_beacon_get_tim struct beacon_data *beacon = rcu_dereference(ap->beacon); if (beacon) { @@ -7853,3 +7872,15 @@ if (local->hw.conf.power_level != power) { changed |= IEEE80211_CONF_CHANGE_POWER; local->hw.conf.power_level = power; +--- a/net/mac80211/status.c ++++ b/net/mac80211/status.c +@@ -180,6 +180,9 @@ static void ieee80211_frame_acked(struct + struct ieee80211_local *local = sta->local; + struct ieee80211_sub_if_data *sdata = sta->sdata; + ++ if (local->hw.flags & IEEE80211_HW_REPORTS_TX_ACK_STATUS) ++ sta->last_rx = jiffies; ++ + if (ieee80211_is_data_qos(mgmt->frame_control)) { + struct ieee80211_hdr *hdr = (void *) skb->data; + u8 *qc = ieee80211_get_qos_ctl(hdr); |