diff options
| author | Johannes Berg | 2009-12-23 13:15:39 +0100 |
|---|---|---|
| committer | John W. Linville | 2009-12-28 22:54:59 +0100 |
| commit | 0c1ad2cac1cb54db38fd4cc1822965071ee83f6e (patch) | |
| tree | d5af632483584b7579ad8b24ba870f9b18e1aaa7 /net/mac80211/main.c | |
| parent | mac80211: split up and insert custom IEs correctly (diff) | |
| download | kernel-qcow2-linux-0c1ad2cac1cb54db38fd4cc1822965071ee83f6e.tar.gz kernel-qcow2-linux-0c1ad2cac1cb54db38fd4cc1822965071ee83f6e.tar.xz kernel-qcow2-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/main.c')
| -rw-r--r-- | net/mac80211/main.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/mac80211/main.c b/net/mac80211/main.c index d35023ce7fa1..5fcd3548417e 100644 --- a/net/mac80211/main.c +++ b/net/mac80211/main.c @@ -359,9 +359,7 @@ struct ieee80211_hw *ieee80211_alloc_hw(size_t priv_data_len, WIPHY_FLAG_4ADDR_STATION; wiphy->privid = mac80211_wiphy_privid; - /* Yes, putting cfg80211_bss into ieee80211_bss is a hack */ - wiphy->bss_priv_size = sizeof(struct ieee80211_bss) - - sizeof(struct cfg80211_bss); + wiphy->bss_priv_size = sizeof(struct ieee80211_bss); local = wiphy_priv(wiphy); |