aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2011-07-13 04:39:09 -0400
committerJohn W. Linville <linville@tuxdriver.com>2011-08-08 14:24:59 -0400
commit262eb9b2237ecee047451a636e799ea1572b685a (patch)
tree162ce4b4f27edf7cdf45bb3e3574d840db2815e1 /include
parenta5d5a914770a81a1f775be2ee35b9fa8fd19d381 (diff)
cfg80211: split wext compatibility to separate header
A lot of drivers erroneously use wext constants and don't notice since cfg80211.h includes them. Make this more split up so drivers needing wext compatibility from cfg80211 need to explicitly include that from cfg80211-wext.h. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include')
-rw-r--r--include/net/cfg80211-wext.h124
-rw-r--r--include/net/cfg80211.h112
2 files changed, 124 insertions, 112 deletions
diff --git a/include/net/cfg80211-wext.h b/include/net/cfg80211-wext.h
new file mode 100644
index 000000000000..204064206654
--- /dev/null
+++ b/include/net/cfg80211-wext.h
@@ -0,0 +1,124 @@
1#ifndef __NET_CFG80211_WEXT_H
2#define __NET_CFG80211_WEXT_H
3/*
4 * 802.11 device and configuration interface -- wext handlers
5 *
6 * Copyright 2006-2010 Johannes Berg <johannes@sipsolutions.net>
7 *
8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License version 2 as
10 * published by the Free Software Foundation.
11 */
12
13#include <linux/netdevice.h>
14#include <linux/wireless.h>
15#include <net/iw_handler.h>
16
17/*
18 * Temporary wext handlers & helper functions
19 *
20 * These are used only by drivers that aren't yet fully
21 * converted to cfg80211.
22 */
23int cfg80211_wext_giwname(struct net_device *dev,
24 struct iw_request_info *info,
25 char *name, char *extra);
26int cfg80211_wext_siwmode(struct net_device *dev, struct iw_request_info *info,
27 u32 *mode, char *extra);
28int cfg80211_wext_giwmode(struct net_device *dev, struct iw_request_info *info,
29 u32 *mode, char *extra);
30int cfg80211_wext_siwscan(struct net_device *dev,
31 struct iw_request_info *info,
32 union iwreq_data *wrqu, char *extra);
33int cfg80211_wext_giwscan(struct net_device *dev,
34 struct iw_request_info *info,
35 struct iw_point *data, char *extra);
36int cfg80211_wext_siwmlme(struct net_device *dev,
37 struct iw_request_info *info,
38 struct iw_point *data, char *extra);
39int cfg80211_wext_giwrange(struct net_device *dev,
40 struct iw_request_info *info,
41 struct iw_point *data, char *extra);
42int cfg80211_wext_siwgenie(struct net_device *dev,
43 struct iw_request_info *info,
44 struct iw_point *data, char *extra);
45int cfg80211_wext_siwauth(struct net_device *dev,
46 struct iw_request_info *info,
47 struct iw_param *data, char *extra);
48int cfg80211_wext_giwauth(struct net_device *dev,
49 struct iw_request_info *info,
50 struct iw_param *data, char *extra);
51
52int cfg80211_wext_siwfreq(struct net_device *dev,
53 struct iw_request_info *info,
54 struct iw_freq *freq, char *extra);
55int cfg80211_wext_giwfreq(struct net_device *dev,
56 struct iw_request_info *info,
57 struct iw_freq *freq, char *extra);
58int cfg80211_wext_siwessid(struct net_device *dev,
59 struct iw_request_info *info,
60 struct iw_point *data, char *ssid);
61int cfg80211_wext_giwessid(struct net_device *dev,
62 struct iw_request_info *info,
63 struct iw_point *data, char *ssid);
64int cfg80211_wext_siwrate(struct net_device *dev,
65 struct iw_request_info *info,
66 struct iw_param *rate, char *extra);
67int cfg80211_wext_giwrate(struct net_device *dev,
68 struct iw_request_info *info,
69 struct iw_param *rate, char *extra);
70
71int cfg80211_wext_siwrts(struct net_device *dev,
72 struct iw_request_info *info,
73 struct iw_param *rts, char *extra);
74int cfg80211_wext_giwrts(struct net_device *dev,
75 struct iw_request_info *info,
76 struct iw_param *rts, char *extra);
77int cfg80211_wext_siwfrag(struct net_device *dev,
78 struct iw_request_info *info,
79 struct iw_param *frag, char *extra);
80int cfg80211_wext_giwfrag(struct net_device *dev,
81 struct iw_request_info *info,
82 struct iw_param *frag, char *extra);
83int cfg80211_wext_siwretry(struct net_device *dev,
84 struct iw_request_info *info,
85 struct iw_param *retry, char *extra);
86int cfg80211_wext_giwretry(struct net_device *dev,
87 struct iw_request_info *info,
88 struct iw_param *retry, char *extra);
89int cfg80211_wext_siwencodeext(struct net_device *dev,
90 struct iw_request_info *info,
91 struct iw_point *erq, char *extra);
92int cfg80211_wext_siwencode(struct net_device *dev,
93 struct iw_request_info *info,
94 struct iw_point *erq, char *keybuf);
95int cfg80211_wext_giwencode(struct net_device *dev,
96 struct iw_request_info *info,
97 struct iw_point *erq, char *keybuf);
98int cfg80211_wext_siwtxpower(struct net_device *dev,
99 struct iw_request_info *info,
100 union iwreq_data *data, char *keybuf);
101int cfg80211_wext_giwtxpower(struct net_device *dev,
102 struct iw_request_info *info,
103 union iwreq_data *data, char *keybuf);
104struct iw_statistics *cfg80211_wireless_stats(struct net_device *dev);
105
106int cfg80211_wext_siwpower(struct net_device *dev,
107 struct iw_request_info *info,
108 struct iw_param *wrq, char *extra);
109int cfg80211_wext_giwpower(struct net_device *dev,
110 struct iw_request_info *info,
111 struct iw_param *wrq, char *extra);
112
113int cfg80211_wext_siwap(struct net_device *dev,
114 struct iw_request_info *info,
115 struct sockaddr *ap_addr, char *extra);
116int cfg80211_wext_giwap(struct net_device *dev,
117 struct iw_request_info *info,
118 struct sockaddr *ap_addr, char *extra);
119
120int cfg80211_wext_siwpmksa(struct net_device *dev,
121 struct iw_request_info *info,
122 struct iw_point *data, char *extra);
123
124#endif /* __NET_CFG80211_WEXT_H */
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index d17f47fc9e31..44e72cc13055 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -20,11 +20,6 @@
20#include <linux/ieee80211.h> 20#include <linux/ieee80211.h>
21#include <net/regulatory.h> 21#include <net/regulatory.h>
22 22
23/* remove once we remove the wext stuff */
24#include <net/iw_handler.h>
25#include <linux/wireless.h>
26
27
28/** 23/**
29 * DOC: Introduction 24 * DOC: Introduction
30 * 25 *
@@ -2393,113 +2388,6 @@ extern int freq_reg_info(struct wiphy *wiphy,
2393 const struct ieee80211_reg_rule **reg_rule); 2388 const struct ieee80211_reg_rule **reg_rule);
2394 2389
2395/* 2390/*
2396 * Temporary wext handlers & helper functions
2397 *
2398 * In the future cfg80211 will simply assign the entire wext handler
2399 * structure to netdevs it manages, but we're not there yet.
2400 */
2401int cfg80211_wext_giwname(struct net_device *dev,
2402 struct iw_request_info *info,
2403 char *name, char *extra);
2404int cfg80211_wext_siwmode(struct net_device *dev, struct iw_request_info *info,
2405 u32 *mode, char *extra);
2406int cfg80211_wext_giwmode(struct net_device *dev, struct iw_request_info *info,
2407 u32 *mode, char *extra);
2408int cfg80211_wext_siwscan(struct net_device *dev,
2409 struct iw_request_info *info,
2410 union iwreq_data *wrqu, char *extra);
2411int cfg80211_wext_giwscan(struct net_device *dev,
2412 struct iw_request_info *info,
2413 struct iw_point *data, char *extra);
2414int cfg80211_wext_siwmlme(struct net_device *dev,
2415 struct iw_request_info *info,
2416 struct iw_point *data, char *extra);
2417int cfg80211_wext_giwrange(struct net_device *dev,
2418 struct iw_request_info *info,
2419 struct iw_point *data, char *extra);
2420int cfg80211_wext_siwgenie(struct net_device *dev,
2421 struct iw_request_info *info,
2422 struct iw_point *data, char *extra);
2423int cfg80211_wext_siwauth(struct net_device *dev,
2424 struct iw_request_info *info,
2425 struct iw_param *data, char *extra);
2426int cfg80211_wext_giwauth(struct net_device *dev,
2427 struct iw_request_info *info,
2428 struct iw_param *data, char *extra);
2429
2430int cfg80211_wext_siwfreq(struct net_device *dev,
2431 struct iw_request_info *info,
2432 struct iw_freq *freq, char *extra);
2433int cfg80211_wext_giwfreq(struct net_device *dev,
2434 struct iw_request_info *info,
2435 struct iw_freq *freq, char *extra);
2436int cfg80211_wext_siwessid(struct net_device *dev,
2437 struct iw_request_info *info,
2438 struct iw_point *data, char *ssid);
2439int cfg80211_wext_giwessid(struct net_device *dev,
2440 struct iw_request_info *info,
2441 struct iw_point *data, char *ssid);
2442int cfg80211_wext_siwrate(struct net_device *dev,
2443 struct iw_request_info *info,
2444 struct iw_param *rate, char *extra);
2445int cfg80211_wext_giwrate(struct net_device *dev,
2446 struct iw_request_info *info,
2447 struct iw_param *rate, char *extra);
2448
2449int cfg80211_wext_siwrts(struct net_device *dev,
2450 struct iw_request_info *info,
2451 struct iw_param *rts, char *extra);
2452int cfg80211_wext_giwrts(struct net_device *dev,
2453 struct iw_request_info *info,
2454 struct iw_param *rts, char *extra);
2455int cfg80211_wext_siwfrag(struct net_device *dev,
2456 struct iw_request_info *info,
2457 struct iw_param *frag, char *extra);
2458int cfg80211_wext_giwfrag(struct net_device *dev,
2459 struct iw_request_info *info,
2460 struct iw_param *frag, char *extra);
2461int cfg80211_wext_siwretry(struct net_device *dev,
2462 struct iw_request_info *info,
2463 struct iw_param *retry, char *extra);
2464int cfg80211_wext_giwretry(struct net_device *dev,
2465 struct iw_request_info *info,
2466 struct iw_param *retry, char *extra);
2467int cfg80211_wext_siwencodeext(struct net_device *dev,
2468 struct iw_request_info *info,
2469 struct iw_point *erq, char *extra);
2470int cfg80211_wext_siwencode(struct net_device *dev,
2471 struct iw_request_info *info,
2472 struct iw_point *erq, char *keybuf);
2473int cfg80211_wext_giwencode(struct net_device *dev,
2474 struct iw_request_info *info,
2475 struct iw_point *erq, char *keybuf);
2476int cfg80211_wext_siwtxpower(struct net_device *dev,
2477 struct iw_request_info *info,
2478 union iwreq_data *data, char *keybuf);
2479int cfg80211_wext_giwtxpower(struct net_device *dev,
2480 struct iw_request_info *info,
2481 union iwreq_data *data, char *keybuf);
2482struct iw_statistics *cfg80211_wireless_stats(struct net_device *dev);
2483
2484int cfg80211_wext_siwpower(struct net_device *dev,
2485 struct iw_request_info *info,
2486 struct iw_param *wrq, char *extra);
2487int cfg80211_wext_giwpower(struct net_device *dev,
2488 struct iw_request_info *info,
2489 struct iw_param *wrq, char *extra);
2490
2491int cfg80211_wext_siwap(struct net_device *dev,
2492 struct iw_request_info *info,
2493 struct sockaddr *ap_addr, char *extra);
2494int cfg80211_wext_giwap(struct net_device *dev,
2495 struct iw_request_info *info,
2496 struct sockaddr *ap_addr, char *extra);
2497
2498int cfg80211_wext_siwpmksa(struct net_device *dev,
2499 struct iw_request_info *info,
2500 struct iw_point *data, char *extra);
2501
2502/*
2503 * callbacks for asynchronous cfg80211 methods, notification 2391 * callbacks for asynchronous cfg80211 methods, notification
2504 * functions and BSS handling helpers 2392 * functions and BSS handling helpers
2505 */ 2393 */
generated by cgit v1.2.2 (git 2.25.0) at 2025-01-07 08:08:29 -0500