summaryrefslogtreecommitdiffstats
path: root/net/mac80211/work.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2009-12-23 13:15:39 +0100
committerJohn W. Linville <linville@tuxdriver.com>2009-12-28 22:54:59 +0100
commit0c1ad2cac1cb54db38fd4cc1822965071ee83f6e (patch)
treed5af632483584b7579ad8b24ba870f9b18e1aaa7 /net/mac80211/work.c
parentmac80211: split up and insert custom IEs correctly (diff)
downloadlinux-0c1ad2cac1cb54db38fd4cc1822965071ee83f6e.tar.xz
linux-0c1ad2cac1cb54db38fd4cc1822965071ee83f6e.zip
mac80211: proper bss private data handling
cfg80211 offers private data for each BSS struct, which mac80211 uses. However, mac80211 uses internal and external (cfg80211) BSS pointers interchangeably and has a hack to put the cfg80211 bss struct into the private struct. Remove this hack, properly converting between the pointers wherever necessary. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/work.c')
-rw-r--r--net/mac80211/work.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/mac80211/work.c b/net/mac80211/work.c
index affdd10b67ad..0b8c31c600aa 100644
--- a/net/mac80211/work.c
+++ b/net/mac80211/work.c
@@ -517,8 +517,7 @@ ieee80211_associate(struct ieee80211_work *wk)
* bss struct for that AP.
*/
if (wk->assoc.bss)
- cfg80211_unlink_bss(local->hw.wiphy,
- &wk->assoc.bss->cbss);
+ cfg80211_unlink_bss(local->hw.wiphy, wk->assoc.bss);
/*
* We might have a pending scan which had no chance to run yet