diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2009-07-27 06:01:50 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-07-29 15:46:14 -0400 |
commit | 0e82ffe3b90bcad72cfe80e4379946b8fb0691ca (patch) | |
tree | c6b73524d4db86ddcaa866d7ea81a9600b610413 /net/wireless/ibss.c | |
parent | a7bc376c858e0e724b8cb2db09b6874562d377ca (diff) |
cfg80211: combine iwfreq implementations
Until now we implemented iwfreq for managed mode, we
needed to keep the implementations separate, but now
that we have all versions implemented we can combine
them and export just one handler.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/wireless/ibss.c')
-rw-r--r-- | net/wireless/ibss.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/wireless/ibss.c b/net/wireless/ibss.c index 8b65e212ae49..de9ac49cd907 100644 --- a/net/wireless/ibss.c +++ b/net/wireless/ibss.c | |||
@@ -7,6 +7,7 @@ | |||
7 | #include <linux/etherdevice.h> | 7 | #include <linux/etherdevice.h> |
8 | #include <linux/if_arp.h> | 8 | #include <linux/if_arp.h> |
9 | #include <net/cfg80211.h> | 9 | #include <net/cfg80211.h> |
10 | #include "wext-compat.h" | ||
10 | #include "nl80211.h" | 11 | #include "nl80211.h" |
11 | 12 | ||
12 | 13 | ||
@@ -312,8 +313,6 @@ int cfg80211_ibss_wext_siwfreq(struct net_device *dev, | |||
312 | 313 | ||
313 | return err; | 314 | return err; |
314 | } | 315 | } |
315 | /* temporary symbol - mark GPL - in the future the handler won't be */ | ||
316 | EXPORT_SYMBOL_GPL(cfg80211_ibss_wext_siwfreq); | ||
317 | 316 | ||
318 | int cfg80211_ibss_wext_giwfreq(struct net_device *dev, | 317 | int cfg80211_ibss_wext_giwfreq(struct net_device *dev, |
319 | struct iw_request_info *info, | 318 | struct iw_request_info *info, |
@@ -342,8 +341,6 @@ int cfg80211_ibss_wext_giwfreq(struct net_device *dev, | |||
342 | /* no channel if not joining */ | 341 | /* no channel if not joining */ |
343 | return -EINVAL; | 342 | return -EINVAL; |
344 | } | 343 | } |
345 | /* temporary symbol - mark GPL - in the future the handler won't be */ | ||
346 | EXPORT_SYMBOL_GPL(cfg80211_ibss_wext_giwfreq); | ||
347 | 344 | ||
348 | int cfg80211_ibss_wext_siwessid(struct net_device *dev, | 345 | int cfg80211_ibss_wext_siwessid(struct net_device *dev, |
349 | struct iw_request_info *info, | 346 | struct iw_request_info *info, |