leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mac80211: in ADHOC don't update last_rx if sta is not authorized

Browse Source 
It does not make sense to keep a station alive if it is not authorised
at all. If IBSS/RSN is used it could also be the case that something
went wrong during the keys exchange and the stations ended up in a not
recoverable state.

By not updating last_rx we are giving the station a chance to be
deleted and to start the key exchange once again from scratch.

Signed-off-by: Antonio Quartulli <antonio@open-mesh.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Antonio Quartulli 2012-11-25 23:13:42 +01:00 committed by Johannes Berg
parent c216e6417f
commit e584da5e3c
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
net/mac80211/rx.c
View File

@ -1341,13 +1341,17 @@ ieee80211_rx_h_sta_process(struct ieee80211_rx_data *rx)
/* /*
* Update last_rx only for IBSS packets which are for the current * Update last_rx only for IBSS packets which are for the current
* BSSID to avoid keeping the current IBSS network alive in cases * BSSID and for station already AUTHORIZED to avoid keeping the
* where other STAs start using different BSSID. * current IBSS network alive in cases where other STAs start
* using different BSSID. This will also give the station another
* chance to restart the authentication/authorization in case
* something went wrong the first time.
*/ */
if (rx->sdata->vif.type == NL80211_IFTYPE_ADHOC) { if (rx->sdata->vif.type == NL80211_IFTYPE_ADHOC) {
u8 *bssid = ieee80211_get_bssid(hdr, rx->skb->len, u8 *bssid = ieee80211_get_bssid(hdr, rx->skb->len,
NL80211_IFTYPE_ADHOC); NL80211_IFTYPE_ADHOC);
if (ether_addr_equal(bssid, rx->sdata->u.ibss.bssid)) { if (ether_addr_equal(bssid, rx->sdata->u.ibss.bssid) &&
test_sta_flag(sta, WLAN_STA_AUTHORIZED)) {
sta->last_rx = jiffies; sta->last_rx = jiffies;
if (ieee80211_is_data(hdr->frame_control)) { if (ieee80211_is_data(hdr->frame_control)) {
sta->last_rx_rate_idx = status->rate_idx; sta->last_rx_rate_idx = status->rate_idx;