mac80211: clean up mesh local link ID generation
802.11-2012 13.3.1 implicitly limits the mesh local link ID range to that of AID, since for mesh PS the local link ID must be indicated in the TIM IE, which only holds IEEE80211_MAX_AID bits. Also the code was allowing a local link ID of 0, but this is not correct since that TIM bit is used for indicating buffered mcast frames. Generate a random, unique, link ID from 1 - 2007, and drop a modulo conversion for the local link ID, but keep it for the peer link ID in case he chose something > MAX_AID. Signed-off-by: Thomas Pedersen <thomas@cozybit.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:

committed by
Johannes Berg

parent
c99a89edb1
commit
204d130426
@@ -576,10 +576,9 @@ void ieee80211_mps_frame_release(struct sta_info *sta,
|
||||
int ac, buffer_local = 0;
|
||||
bool has_buffered = false;
|
||||
|
||||
/* TIM map only for LLID <= IEEE80211_MAX_AID */
|
||||
if (sta->plink_state == NL80211_PLINK_ESTAB)
|
||||
has_buffered = ieee80211_check_tim(elems->tim, elems->tim_len,
|
||||
le16_to_cpu(sta->llid) % IEEE80211_MAX_AID);
|
||||
le16_to_cpu(sta->llid));
|
||||
|
||||
if (has_buffered)
|
||||
mps_dbg(sta->sdata, "%pM indicates buffered frames\n",
|
||||
|
Reference in New Issue
Block a user