aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2011-07-15 07:01:38 -0400
committerJohn W. Linville <linville@tuxdriver.com>2011-08-08 14:26:29 -0400
commit04b0c5c6995103eef56391c163e970ab1f03b59f (patch)
tree252c64fa6c6bcfc7b42fe014b0f4bf2bd80ad0e8 /net
parent67a50035b3f9335b9e5800c32149173e797b9cc0 (diff)
cfg80211: remove unused wext handler exports
A lot of code is dedicated to giving drivers the ability to use cfg80211's wext handlers without completely converting. However, only orinoco is currently using this, and it is only partially using it. We reduce the size of both the source and binary by removing those that nobody needs. If a driver shows up that needs it during conversion, we can add back those that are needed. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net')
-rw-r--r--net/wireless/wext-compat.c136
-rw-r--r--net/wireless/wext-compat.h8
-rw-r--r--net/wireless/wext-sme.c2
3 files changed, 66 insertions, 80 deletions
diff --git a/net/wireless/wext-compat.c b/net/wireless/wext-compat.c
index 355a63a46c42..62f121d1d9cb 100644
--- a/net/wireless/wext-compat.c
+++ b/net/wireless/wext-compat.c
@@ -364,9 +364,9 @@ int cfg80211_wext_giwfrag(struct net_device *dev,
364} 364}
365EXPORT_SYMBOL_GPL(cfg80211_wext_giwfrag); 365EXPORT_SYMBOL_GPL(cfg80211_wext_giwfrag);
366 366
367int cfg80211_wext_siwretry(struct net_device *dev, 367static int cfg80211_wext_siwretry(struct net_device *dev,
368 struct iw_request_info *info, 368 struct iw_request_info *info,
369 struct iw_param *retry, char *extra) 369 struct iw_param *retry, char *extra)
370{ 370{
371 struct wireless_dev *wdev = dev->ieee80211_ptr; 371 struct wireless_dev *wdev = dev->ieee80211_ptr;
372 struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy); 372 struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy);
@@ -403,7 +403,6 @@ int cfg80211_wext_siwretry(struct net_device *dev,
403 403
404 return err; 404 return err;
405} 405}
406EXPORT_SYMBOL_GPL(cfg80211_wext_siwretry);
407 406
408int cfg80211_wext_giwretry(struct net_device *dev, 407int cfg80211_wext_giwretry(struct net_device *dev,
409 struct iw_request_info *info, 408 struct iw_request_info *info,
@@ -594,9 +593,9 @@ static int cfg80211_set_encryption(struct cfg80211_registered_device *rdev,
594 return err; 593 return err;
595} 594}
596 595
597int cfg80211_wext_siwencode(struct net_device *dev, 596static int cfg80211_wext_siwencode(struct net_device *dev,
598 struct iw_request_info *info, 597 struct iw_request_info *info,
599 struct iw_point *erq, char *keybuf) 598 struct iw_point *erq, char *keybuf)
600{ 599{
601 struct wireless_dev *wdev = dev->ieee80211_ptr; 600 struct wireless_dev *wdev = dev->ieee80211_ptr;
602 struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy); 601 struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy);
@@ -653,11 +652,10 @@ int cfg80211_wext_siwencode(struct net_device *dev,
653 wdev->wext.default_key == -1, 652 wdev->wext.default_key == -1,
654 idx, &params); 653 idx, &params);
655} 654}
656EXPORT_SYMBOL_GPL(cfg80211_wext_siwencode);
657 655
658int cfg80211_wext_siwencodeext(struct net_device *dev, 656static int cfg80211_wext_siwencodeext(struct net_device *dev,
659 struct iw_request_info *info, 657 struct iw_request_info *info,
660 struct iw_point *erq, char *extra) 658 struct iw_point *erq, char *extra)
661{ 659{
662 struct wireless_dev *wdev = dev->ieee80211_ptr; 660 struct wireless_dev *wdev = dev->ieee80211_ptr;
663 struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy); 661 struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy);
@@ -745,11 +743,10 @@ int cfg80211_wext_siwencodeext(struct net_device *dev,
745 ext->ext_flags & IW_ENCODE_EXT_SET_TX_KEY, 743 ext->ext_flags & IW_ENCODE_EXT_SET_TX_KEY,
746 idx, &params); 744 idx, &params);
747} 745}
748EXPORT_SYMBOL_GPL(cfg80211_wext_siwencodeext);
749 746
750int cfg80211_wext_giwencode(struct net_device *dev, 747static int cfg80211_wext_giwencode(struct net_device *dev,
751 struct iw_request_info *info, 748 struct iw_request_info *info,
752 struct iw_point *erq, char *keybuf) 749 struct iw_point *erq, char *keybuf)
753{ 750{
754 struct wireless_dev *wdev = dev->ieee80211_ptr; 751 struct wireless_dev *wdev = dev->ieee80211_ptr;
755 int idx; 752 int idx;
@@ -783,11 +780,10 @@ int cfg80211_wext_giwencode(struct net_device *dev,
783 780
784 return 0; 781 return 0;
785} 782}
786EXPORT_SYMBOL_GPL(cfg80211_wext_giwencode);
787 783
788int cfg80211_wext_siwfreq(struct net_device *dev, 784static int cfg80211_wext_siwfreq(struct net_device *dev,
789 struct iw_request_info *info, 785 struct iw_request_info *info,
790 struct iw_freq *wextfreq, char *extra) 786 struct iw_freq *wextfreq, char *extra)
791{ 787{
792 struct wireless_dev *wdev = dev->ieee80211_ptr; 788 struct wireless_dev *wdev = dev->ieee80211_ptr;
793 struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy); 789 struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy);
@@ -816,11 +812,10 @@ int cfg80211_wext_siwfreq(struct net_device *dev,
816 return -EOPNOTSUPP; 812 return -EOPNOTSUPP;
817 } 813 }
818} 814}
819EXPORT_SYMBOL_GPL(cfg80211_wext_siwfreq);
820 815
821int cfg80211_wext_giwfreq(struct net_device *dev, 816static int cfg80211_wext_giwfreq(struct net_device *dev,
822 struct iw_request_info *info, 817 struct iw_request_info *info,
823 struct iw_freq *freq, char *extra) 818 struct iw_freq *freq, char *extra)
824{ 819{
825 struct wireless_dev *wdev = dev->ieee80211_ptr; 820 struct wireless_dev *wdev = dev->ieee80211_ptr;
826 821
@@ -837,11 +832,10 @@ int cfg80211_wext_giwfreq(struct net_device *dev,
837 return 0; 832 return 0;
838 } 833 }
839} 834}
840EXPORT_SYMBOL_GPL(cfg80211_wext_giwfreq);
841 835
842int cfg80211_wext_siwtxpower(struct net_device *dev, 836static int cfg80211_wext_siwtxpower(struct net_device *dev,
843 struct iw_request_info *info, 837 struct iw_request_info *info,
844 union iwreq_data *data, char *extra) 838 union iwreq_data *data, char *extra)
845{ 839{
846 struct wireless_dev *wdev = dev->ieee80211_ptr; 840 struct wireless_dev *wdev = dev->ieee80211_ptr;
847 struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy); 841 struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy);
@@ -890,11 +884,10 @@ int cfg80211_wext_siwtxpower(struct net_device *dev,
890 884
891 return rdev->ops->set_tx_power(wdev->wiphy, type, DBM_TO_MBM(dbm)); 885 return rdev->ops->set_tx_power(wdev->wiphy, type, DBM_TO_MBM(dbm));
892} 886}
893EXPORT_SYMBOL_GPL(cfg80211_wext_siwtxpower);
894 887
895int cfg80211_wext_giwtxpower(struct net_device *dev, 888static int cfg80211_wext_giwtxpower(struct net_device *dev,
896 struct iw_request_info *info, 889 struct iw_request_info *info,
897 union iwreq_data *data, char *extra) 890 union iwreq_data *data, char *extra)
898{ 891{
899 struct wireless_dev *wdev = dev->ieee80211_ptr; 892 struct wireless_dev *wdev = dev->ieee80211_ptr;
900 struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy); 893 struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy);
@@ -920,7 +913,6 @@ int cfg80211_wext_giwtxpower(struct net_device *dev,
920 913
921 return 0; 914 return 0;
922} 915}
923EXPORT_SYMBOL_GPL(cfg80211_wext_giwtxpower);
924 916
925static int cfg80211_set_auth_alg(struct wireless_dev *wdev, 917static int cfg80211_set_auth_alg(struct wireless_dev *wdev,
926 s32 auth_alg) 918 s32 auth_alg)
@@ -1071,9 +1063,9 @@ static int cfg80211_set_key_mgt(struct wireless_dev *wdev, u32 key_mgt)
1071 return 0; 1063 return 0;
1072} 1064}
1073 1065
1074int cfg80211_wext_siwauth(struct net_device *dev, 1066static int cfg80211_wext_siwauth(struct net_device *dev,
1075 struct iw_request_info *info, 1067 struct iw_request_info *info,
1076 struct iw_param *data, char *extra) 1068 struct iw_param *data, char *extra)
1077{ 1069{
1078 struct wireless_dev *wdev = dev->ieee80211_ptr; 1070 struct wireless_dev *wdev = dev->ieee80211_ptr;
1079 1071
@@ -1103,21 +1095,19 @@ int cfg80211_wext_siwauth(struct net_device *dev,
1103 return -EOPNOTSUPP; 1095 return -EOPNOTSUPP;
1104 } 1096 }
1105} 1097}
1106EXPORT_SYMBOL_GPL(cfg80211_wext_siwauth);
1107 1098
1108int cfg80211_wext_giwauth(struct net_device *dev, 1099static int cfg80211_wext_giwauth(struct net_device *dev,
1109 struct iw_request_info *info, 1100 struct iw_request_info *info,
1110 struct iw_param *data, char *extra) 1101 struct iw_param *data, char *extra)
1111{ 1102{
1112 /* XXX: what do we need? */ 1103 /* XXX: what do we need? */
1113 1104
1114 return -EOPNOTSUPP; 1105 return -EOPNOTSUPP;
1115} 1106}
1116EXPORT_SYMBOL_GPL(cfg80211_wext_giwauth);
1117 1107
1118int cfg80211_wext_siwpower(struct net_device *dev, 1108static int cfg80211_wext_siwpower(struct net_device *dev,
1119 struct iw_request_info *info, 1109 struct iw_request_info *info,
1120 struct iw_param *wrq, char *extra) 1110 struct iw_param *wrq, char *extra)
1121{ 1111{
1122 struct wireless_dev *wdev = dev->ieee80211_ptr; 1112 struct wireless_dev *wdev = dev->ieee80211_ptr;
1123 struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy); 1113 struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy);
@@ -1161,11 +1151,10 @@ int cfg80211_wext_siwpower(struct net_device *dev,
1161 return 0; 1151 return 0;
1162 1152
1163} 1153}
1164EXPORT_SYMBOL_GPL(cfg80211_wext_siwpower);
1165 1154
1166int cfg80211_wext_giwpower(struct net_device *dev, 1155static int cfg80211_wext_giwpower(struct net_device *dev,
1167 struct iw_request_info *info, 1156 struct iw_request_info *info,
1168 struct iw_param *wrq, char *extra) 1157 struct iw_param *wrq, char *extra)
1169{ 1158{
1170 struct wireless_dev *wdev = dev->ieee80211_ptr; 1159 struct wireless_dev *wdev = dev->ieee80211_ptr;
1171 1160
@@ -1173,7 +1162,6 @@ int cfg80211_wext_giwpower(struct net_device *dev,
1173 1162
1174 return 0; 1163 return 0;
1175} 1164}
1176EXPORT_SYMBOL_GPL(cfg80211_wext_giwpower);
1177 1165
1178static int cfg80211_wds_wext_siwap(struct net_device *dev, 1166static int cfg80211_wds_wext_siwap(struct net_device *dev,
1179 struct iw_request_info *info, 1167 struct iw_request_info *info,
@@ -1219,9 +1207,9 @@ static int cfg80211_wds_wext_giwap(struct net_device *dev,
1219 return 0; 1207 return 0;
1220} 1208}
1221 1209
1222int cfg80211_wext_siwrate(struct net_device *dev, 1210static int cfg80211_wext_siwrate(struct net_device *dev,
1223 struct iw_request_info *info, 1211 struct iw_request_info *info,
1224 struct iw_param *rate, char *extra) 1212 struct iw_param *rate, char *extra)
1225{ 1213{
1226 struct wireless_dev *wdev = dev->ieee80211_ptr; 1214 struct wireless_dev *wdev = dev->ieee80211_ptr;
1227 struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy); 1215 struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy);
@@ -1269,11 +1257,10 @@ int cfg80211_wext_siwrate(struct net_device *dev,
1269 1257
1270 return rdev->ops->set_bitrate_mask(wdev->wiphy, dev, NULL, &mask); 1258 return rdev->ops->set_bitrate_mask(wdev->wiphy, dev, NULL, &mask);
1271} 1259}
1272EXPORT_SYMBOL_GPL(cfg80211_wext_siwrate);
1273 1260
1274int cfg80211_wext_giwrate(struct net_device *dev, 1261static int cfg80211_wext_giwrate(struct net_device *dev,
1275 struct iw_request_info *info, 1262 struct iw_request_info *info,
1276 struct iw_param *rate, char *extra) 1263 struct iw_param *rate, char *extra)
1277{ 1264{
1278 struct wireless_dev *wdev = dev->ieee80211_ptr; 1265 struct wireless_dev *wdev = dev->ieee80211_ptr;
1279 struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy); 1266 struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy);
@@ -1309,10 +1296,9 @@ int cfg80211_wext_giwrate(struct net_device *dev,
1309 1296
1310 return 0; 1297 return 0;
1311} 1298}
1312EXPORT_SYMBOL_GPL(cfg80211_wext_giwrate);
1313 1299
1314/* Get wireless statistics. Called by /proc/net/wireless and by SIOCGIWSTATS */ 1300/* Get wireless statistics. Called by /proc/net/wireless and by SIOCGIWSTATS */
1315struct iw_statistics *cfg80211_wireless_stats(struct net_device *dev) 1301static struct iw_statistics *cfg80211_wireless_stats(struct net_device *dev)
1316{ 1302{
1317 struct wireless_dev *wdev = dev->ieee80211_ptr; 1303 struct wireless_dev *wdev = dev->ieee80211_ptr;
1318 struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy); 1304 struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy);
@@ -1377,11 +1363,10 @@ struct iw_statistics *cfg80211_wireless_stats(struct net_device *dev)
1377 1363
1378 return &wstats; 1364 return &wstats;
1379} 1365}
1380EXPORT_SYMBOL_GPL(cfg80211_wireless_stats);
1381 1366
1382int cfg80211_wext_siwap(struct net_device *dev, 1367static int cfg80211_wext_siwap(struct net_device *dev,
1383 struct iw_request_info *info, 1368 struct iw_request_info *info,
1384 struct sockaddr *ap_addr, char *extra) 1369 struct sockaddr *ap_addr, char *extra)
1385{ 1370{
1386 struct wireless_dev *wdev = dev->ieee80211_ptr; 1371 struct wireless_dev *wdev = dev->ieee80211_ptr;
1387 1372
@@ -1396,11 +1381,10 @@ int cfg80211_wext_siwap(struct net_device *dev,
1396 return -EOPNOTSUPP; 1381 return -EOPNOTSUPP;
1397 } 1382 }
1398} 1383}
1399EXPORT_SYMBOL_GPL(cfg80211_wext_siwap);
1400 1384
1401int cfg80211_wext_giwap(struct net_device *dev, 1385static int cfg80211_wext_giwap(struct net_device *dev,
1402 struct iw_request_info *info, 1386 struct iw_request_info *info,
1403 struct sockaddr *ap_addr, char *extra) 1387 struct sockaddr *ap_addr, char *extra)
1404{ 1388{
1405 struct wireless_dev *wdev = dev->ieee80211_ptr; 1389 struct wireless_dev *wdev = dev->ieee80211_ptr;
1406 1390
@@ -1415,11 +1399,10 @@ int cfg80211_wext_giwap(struct net_device *dev,
1415 return -EOPNOTSUPP; 1399 return -EOPNOTSUPP;
1416 } 1400 }
1417} 1401}
1418EXPORT_SYMBOL_GPL(cfg80211_wext_giwap);
1419 1402
1420int cfg80211_wext_siwessid(struct net_device *dev, 1403static int cfg80211_wext_siwessid(struct net_device *dev,
1421 struct iw_request_info *info, 1404 struct iw_request_info *info,
1422 struct iw_point *data, char *ssid) 1405 struct iw_point *data, char *ssid)
1423{ 1406{
1424 struct wireless_dev *wdev = dev->ieee80211_ptr; 1407 struct wireless_dev *wdev = dev->ieee80211_ptr;
1425 1408
@@ -1432,11 +1415,10 @@ int cfg80211_wext_siwessid(struct net_device *dev,
1432 return -EOPNOTSUPP; 1415 return -EOPNOTSUPP;
1433 } 1416 }
1434} 1417}
1435EXPORT_SYMBOL_GPL(cfg80211_wext_siwessid);
1436 1418
1437int cfg80211_wext_giwessid(struct net_device *dev, 1419static int cfg80211_wext_giwessid(struct net_device *dev,
1438 struct iw_request_info *info, 1420 struct iw_request_info *info,
1439 struct iw_point *data, char *ssid) 1421 struct iw_point *data, char *ssid)
1440{ 1422{
1441 struct wireless_dev *wdev = dev->ieee80211_ptr; 1423 struct wireless_dev *wdev = dev->ieee80211_ptr;
1442 1424
@@ -1452,11 +1434,10 @@ int cfg80211_wext_giwessid(struct net_device *dev,
1452 return -EOPNOTSUPP; 1434 return -EOPNOTSUPP;
1453 } 1435 }
1454} 1436}
1455EXPORT_SYMBOL_GPL(cfg80211_wext_giwessid);
1456 1437
1457int cfg80211_wext_siwpmksa(struct net_device *dev, 1438static int cfg80211_wext_siwpmksa(struct net_device *dev,
1458 struct iw_request_info *info, 1439 struct iw_request_info *info,
1459 struct iw_point *data, char *extra) 1440 struct iw_point *data, char *extra)
1460{ 1441{
1461 struct wireless_dev *wdev = dev->ieee80211_ptr; 1442 struct wireless_dev *wdev = dev->ieee80211_ptr;
1462 struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy); 1443 struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy);
@@ -1494,7 +1475,6 @@ int cfg80211_wext_siwpmksa(struct net_device *dev,
1494 return -EOPNOTSUPP; 1475 return -EOPNOTSUPP;
1495 } 1476 }
1496} 1477}
1497EXPORT_SYMBOL_GPL(cfg80211_wext_siwpmksa);
1498 1478
1499static const iw_handler cfg80211_handlers[] = { 1479static const iw_handler cfg80211_handlers[] = {
1500 [IW_IOCTL_IDX(SIOCGIWNAME)] = (iw_handler) cfg80211_wext_giwname, 1480 [IW_IOCTL_IDX(SIOCGIWNAME)] = (iw_handler) cfg80211_wext_giwname,
diff --git a/net/wireless/wext-compat.h b/net/wireless/wext-compat.h
index 20b3daef6964..5d766b0118e8 100644
--- a/net/wireless/wext-compat.h
+++ b/net/wireless/wext-compat.h
@@ -42,6 +42,14 @@ int cfg80211_mgd_wext_giwessid(struct net_device *dev,
42 struct iw_request_info *info, 42 struct iw_request_info *info,
43 struct iw_point *data, char *ssid); 43 struct iw_point *data, char *ssid);
44 44
45int cfg80211_wext_siwmlme(struct net_device *dev,
46 struct iw_request_info *info,
47 struct iw_point *data, char *extra);
48int cfg80211_wext_siwgenie(struct net_device *dev,
49 struct iw_request_info *info,
50 struct iw_point *data, char *extra);
51
52
45int cfg80211_wext_freq(struct wiphy *wiphy, struct iw_freq *freq); 53int cfg80211_wext_freq(struct wiphy *wiphy, struct iw_freq *freq);
46 54
47 55
diff --git a/net/wireless/wext-sme.c b/net/wireless/wext-sme.c
index 494a12ff446f..0d4b8c3033ff 100644
--- a/net/wireless/wext-sme.c
+++ b/net/wireless/wext-sme.c
@@ -366,7 +366,6 @@ int cfg80211_wext_siwgenie(struct net_device *dev,
366 wdev_unlock(wdev); 366 wdev_unlock(wdev);
367 return err; 367 return err;
368} 368}
369EXPORT_SYMBOL_GPL(cfg80211_wext_siwgenie);
370 369
371int cfg80211_wext_siwmlme(struct net_device *dev, 370int cfg80211_wext_siwmlme(struct net_device *dev,
372 struct iw_request_info *info, 371 struct iw_request_info *info,
@@ -403,4 +402,3 @@ int cfg80211_wext_siwmlme(struct net_device *dev,
403 402
404 return err; 403 return err;
405} 404}
406EXPORT_SYMBOL_GPL(cfg80211_wext_siwmlme);
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-12 22:13:51 -0500