aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/rx.c
diff options
context:
space:
mode:
authorBruno Randolf <bruno@thinktube.com>2008-02-17 21:21:36 -0500
committerJohn W. Linville <linville@tuxdriver.com>2008-02-29 15:37:12 -0500
commit9d9bf77d16ba527f6f63846ca18cf20ae6e8d697 (patch)
treea8ae534cb92ef2368fee0b5fb4d092530a8017ee /net/mac80211/rx.c
parenta607268a0d5532d6ae3777ddd0339ff7d8b037a0 (diff)
mac80211: enable IBSS merging
enable IBSS cell merging. if an IBSS beacon with the same channel, same ESSID and a TSF higher than the local TSF (mactime) is received, we have to join its BSSID. while this might not be immediately apparent from reading the 802.11 standard it is compliant and necessary to make IBSS mode functional in many cases. most drivers have a similar behaviour. * move the relevant code section (previously only containing debug code) down to the end of the function, so we can reuse the bss structure. * we have to compare the mactime (TSF at the time of packet receive) rather than the current TSF. since mactime is defined as the time the first data symbol arrived we add the time until byte 24 where the timestamp resides, since this is how the beacon timestamp is defined. as some some drivers are not able to give a reliable mactime we fall back to use the current TSF, which will be enough to catch most (but not all) cases where an IBSS merge is necessary. * in IBSS mode we want to allow beacons to override probe response info so we can correctly do merges. * we don't only configure beacons based on scan results, so change that message. * to enable this we have to let all beacons thru in IBSS mode, even if they have a different BSSID. Signed-off-by: Bruno Randolf <bruno@thinktube.com> Acked-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/rx.c')
-rw-r--r--net/mac80211/rx.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 472b19fc9143..279ee493520d 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -1695,7 +1695,10 @@ static int prepare_for_handlers(struct ieee80211_sub_if_data *sdata,
1695 case IEEE80211_IF_TYPE_IBSS: 1695 case IEEE80211_IF_TYPE_IBSS:
1696 if (!bssid) 1696 if (!bssid)
1697 return 0; 1697 return 0;
1698 if (!ieee80211_bssid_match(bssid, sdata->u.sta.bssid)) { 1698 if ((rx->fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_MGMT &&
1699 (rx->fc & IEEE80211_FCTL_STYPE) == IEEE80211_STYPE_BEACON)
1700 return 1;
1701 else if (!ieee80211_bssid_match(bssid, sdata->u.sta.bssid)) {
1699 if (!(rx->flags & IEEE80211_TXRXD_RXIN_SCAN)) 1702 if (!(rx->flags & IEEE80211_TXRXD_RXIN_SCAN))
1700 return 0; 1703 return 0;
1701 rx->flags &= ~IEEE80211_TXRXD_RXRA_MATCH; 1704 rx->flags &= ~IEEE80211_TXRXD_RXRA_MATCH;