diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2008-10-10 19:51:51 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-10-31 19:00:15 -0400 |
commit | bda3933a8aceedd03e0dd410844bd310033ca756 (patch) | |
tree | f4d2c70a6338e500b6db93b073801181280b1840 /net/mac80211/iface.c | |
parent | 9124b07740c51cbc6e358dd0c4abc6ee8ded084d (diff) |
mac80211: move bss_conf into vif
Move bss_conf into the vif struct so that drivers can
access it during ->tx without having to store it in
the private data or similar. No driver updates because
this is only for when they want to start using it.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/iface.c')
-rw-r--r-- | net/mac80211/iface.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index df28c5f7c9c0..cde145221b61 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c | |||
@@ -695,7 +695,7 @@ int ieee80211_if_change_type(struct ieee80211_sub_if_data *sdata, | |||
695 | ieee80211_setup_sdata(sdata, type); | 695 | ieee80211_setup_sdata(sdata, type); |
696 | 696 | ||
697 | /* reset some values that shouldn't be kept across type changes */ | 697 | /* reset some values that shouldn't be kept across type changes */ |
698 | sdata->bss_conf.basic_rates = | 698 | sdata->vif.bss_conf.basic_rates = |
699 | ieee80211_mandatory_rates(sdata->local, | 699 | ieee80211_mandatory_rates(sdata->local, |
700 | sdata->local->hw.conf.channel->band); | 700 | sdata->local->hw.conf.channel->band); |
701 | sdata->drop_unencrypted = 0; | 701 | sdata->drop_unencrypted = 0; |