diff options
| author | Johannes Berg <johannes@sipsolutions.net> | 2008-07-09 14:40:37 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2008-07-14 14:30:07 -0400 |
| commit | 9d139c810a2aa17365cc548d0cd2a189d8433c65 (patch) | |
| tree | ef10ca55f93689ab97368376d277102d2527c961 /net/mac80211/cfg.c | |
| parent | f3947e2dfa3b18f375b7acd03b7ee2877d0751fc (diff) | |
| download | kernel-crypto-9d139c810a2aa17365cc548d0cd2a189d8433c65.tar.gz kernel-crypto-9d139c810a2aa17365cc548d0cd2a189d8433c65.tar.xz kernel-crypto-9d139c810a2aa17365cc548d0cd2a189d8433c65.zip | |
mac80211: revamp beacon configuration
This patch changes mac80211's beacon configuration handling
to never pass skbs to the driver directly but rather always
require the driver to use ieee80211_beacon_get(). Additionally,
it introduces "change flags" on the config_interface() call
to enable drivers to figure out what is changing. Finally, it
removes the beacon_update() driver callback in favour of
having IBSS beacon delivered by ieee80211_beacon_get() as well.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/cfg.c')
| -rw-r--r-- | net/mac80211/cfg.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index ea0301025c1..8e7ba0e62cf 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -469,7 +469,7 @@ static int ieee80211_config_beacon(struct ieee80211_sub_if_data *sdata, kfree(old); - return ieee80211_if_config_beacon(sdata->dev); + return ieee80211_if_config(sdata, IEEE80211_IFCC_BEACON); } static int ieee80211_add_beacon(struct wiphy *wiphy, struct net_device *dev, @@ -523,7 +523,7 @@ static int ieee80211_del_beacon(struct wiphy *wiphy, struct net_device *dev) synchronize_rcu(); kfree(old); - return ieee80211_if_config_beacon(dev); + return ieee80211_if_config(sdata, IEEE80211_IFCC_BEACON); } /* Layer 2 Update frame (802.2 Type 1 LLC XID Update response) */ |