diff options
| author | Johannes Berg <johannes@sipsolutions.net> | 2009-12-23 07:15:39 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2009-12-28 16:54:59 -0500 |
| commit | 0c1ad2cac1cb54db38fd4cc1822965071ee83f6e (patch) | |
| tree | d5af632483584b7579ad8b24ba870f9b18e1aaa7 /net/mac80211/work.c | |
| parent | 8e664fb3fd2b04e3ac5fad7f046000ba54e0e275 (diff) | |
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.c | 3 |
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) | |||
| 517 | * bss struct for that AP. | 517 | * bss struct for that AP. |
| 518 | */ | 518 | */ |
| 519 | if (wk->assoc.bss) | 519 | if (wk->assoc.bss) |
| 520 | cfg80211_unlink_bss(local->hw.wiphy, | 520 | cfg80211_unlink_bss(local->hw.wiphy, wk->assoc.bss); |
| 521 | &wk->assoc.bss->cbss); | ||
| 522 | 521 | ||
| 523 | /* | 522 | /* |
| 524 | * We might have a pending scan which had no chance to run yet | 523 | * We might have a pending scan which had no chance to run yet |