cfg80211: remove unused wext handler exports

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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>

authored by

Johannes Berg and committed by

John W. Linville 14 years ago 04b0c5c6 67a50035

+66 -149

4 changed files

expand all

include

net

cfg80211-wext.h

net

wireless

wext-compat.c

wext-compat.h

wext-sme.c

-69

include/net/cfg80211-wext.h

··· 33 33 int cfg80211_wext_giwscan(struct net_device *dev, 34 34 struct iw_request_info *info, 35 35 struct iw_point *data, char *extra); 36 - int cfg80211_wext_siwmlme(struct net_device *dev, 37 - struct iw_request_info *info, 38 - struct iw_point *data, char *extra); 39 36 int cfg80211_wext_giwrange(struct net_device *dev, 40 37 struct iw_request_info *info, 41 38 struct iw_point *data, char *extra); 42 - int cfg80211_wext_siwgenie(struct net_device *dev, 43 - struct iw_request_info *info, 44 - struct iw_point *data, char *extra); 45 - int cfg80211_wext_siwauth(struct net_device *dev, 46 - struct iw_request_info *info, 47 - struct iw_param *data, char *extra); 48 - int cfg80211_wext_giwauth(struct net_device *dev, 49 - struct iw_request_info *info, 50 - struct iw_param *data, char *extra); 51 - 52 - int cfg80211_wext_siwfreq(struct net_device *dev, 53 - struct iw_request_info *info, 54 - struct iw_freq *freq, char *extra); 55 - int cfg80211_wext_giwfreq(struct net_device *dev, 56 - struct iw_request_info *info, 57 - struct iw_freq *freq, char *extra); 58 - int cfg80211_wext_siwessid(struct net_device *dev, 59 - struct iw_request_info *info, 60 - struct iw_point *data, char *ssid); 61 - int cfg80211_wext_giwessid(struct net_device *dev, 62 - struct iw_request_info *info, 63 - struct iw_point *data, char *ssid); 64 - int cfg80211_wext_siwrate(struct net_device *dev, 65 - struct iw_request_info *info, 66 - struct iw_param *rate, char *extra); 67 - int cfg80211_wext_giwrate(struct net_device *dev, 68 - struct iw_request_info *info, 69 - struct iw_param *rate, char *extra); 70 - 71 39 int cfg80211_wext_siwrts(struct net_device *dev, 72 40 struct iw_request_info *info, 73 41 struct iw_param *rts, char *extra); ··· 48 80 int cfg80211_wext_giwfrag(struct net_device *dev, 49 81 struct iw_request_info *info, 50 82 struct iw_param *frag, char *extra); 51 - int cfg80211_wext_siwretry(struct net_device *dev, 52 - struct iw_request_info *info, 53 - struct iw_param *retry, char *extra); 54 83 int cfg80211_wext_giwretry(struct net_device *dev, 55 84 struct iw_request_info *info, 56 85 struct iw_param *retry, char *extra); 57 - int cfg80211_wext_siwencodeext(struct net_device *dev, 58 - struct iw_request_info *info, 59 - struct iw_point *erq, char *extra); 60 - int cfg80211_wext_siwencode(struct net_device *dev, 61 - struct iw_request_info *info, 62 - struct iw_point *erq, char *keybuf); 63 - int cfg80211_wext_giwencode(struct net_device *dev, 64 - struct iw_request_info *info, 65 - struct iw_point *erq, char *keybuf); 66 - int cfg80211_wext_siwtxpower(struct net_device *dev, 67 - struct iw_request_info *info, 68 - union iwreq_data *data, char *keybuf); 69 - int cfg80211_wext_giwtxpower(struct net_device *dev, 70 - struct iw_request_info *info, 71 - union iwreq_data *data, char *keybuf); 72 - struct iw_statistics *cfg80211_wireless_stats(struct net_device *dev); 73 - 74 - int cfg80211_wext_siwpower(struct net_device *dev, 75 - struct iw_request_info *info, 76 - struct iw_param *wrq, char *extra); 77 - int cfg80211_wext_giwpower(struct net_device *dev, 78 - struct iw_request_info *info, 79 - struct iw_param *wrq, char *extra); 80 - 81 - int cfg80211_wext_siwap(struct net_device *dev, 82 - struct iw_request_info *info, 83 - struct sockaddr *ap_addr, char *extra); 84 - int cfg80211_wext_giwap(struct net_device *dev, 85 - struct iw_request_info *info, 86 - struct sockaddr *ap_addr, char *extra); 87 - 88 - int cfg80211_wext_siwpmksa(struct net_device *dev, 89 - struct iw_request_info *info, 90 - struct iw_point *data, char *extra); 91 86 92 87 #endif /* __NET_CFG80211_WEXT_H */

+58 -78

net/wireless/wext-compat.c

··· 364 364 } 365 365 EXPORT_SYMBOL_GPL(cfg80211_wext_giwfrag); 366 366 367 - int cfg80211_wext_siwretry(struct net_device *dev, 368 - struct iw_request_info *info, 369 - struct iw_param *retry, char *extra) 367 + static int cfg80211_wext_siwretry(struct net_device *dev, 368 + struct iw_request_info *info, 369 + struct iw_param *retry, char *extra) 370 370 { 371 371 struct wireless_dev *wdev = dev->ieee80211_ptr; 372 372 struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy); ··· 403 403 404 404 return err; 405 405 } 406 - EXPORT_SYMBOL_GPL(cfg80211_wext_siwretry); 407 406 408 407 int cfg80211_wext_giwretry(struct net_device *dev, 409 408 struct iw_request_info *info, ··· 593 594 return err; 594 595 } 595 596 596 - int cfg80211_wext_siwencode(struct net_device *dev, 597 - struct iw_request_info *info, 598 - struct iw_point *erq, char *keybuf) 597 + static int cfg80211_wext_siwencode(struct net_device *dev, 598 + struct iw_request_info *info, 599 + struct iw_point *erq, char *keybuf) 599 600 { 600 601 struct wireless_dev *wdev = dev->ieee80211_ptr; 601 602 struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy); ··· 652 653 wdev->wext.default_key == -1, 653 654 idx, &params); 654 655 } 655 - EXPORT_SYMBOL_GPL(cfg80211_wext_siwencode); 656 656 657 - int cfg80211_wext_siwencodeext(struct net_device *dev, 658 - struct iw_request_info *info, 659 - struct iw_point *erq, char *extra) 657 + static int cfg80211_wext_siwencodeext(struct net_device *dev, 658 + struct iw_request_info *info, 659 + struct iw_point *erq, char *extra) 660 660 { 661 661 struct wireless_dev *wdev = dev->ieee80211_ptr; 662 662 struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy); ··· 743 745 ext->ext_flags & IW_ENCODE_EXT_SET_TX_KEY, 744 746 idx, &params); 745 747 } 746 - EXPORT_SYMBOL_GPL(cfg80211_wext_siwencodeext); 747 748 748 - int cfg80211_wext_giwencode(struct net_device *dev, 749 - struct iw_request_info *info, 750 - struct iw_point *erq, char *keybuf) 749 + static int cfg80211_wext_giwencode(struct net_device *dev, 750 + struct iw_request_info *info, 751 + struct iw_point *erq, char *keybuf) 751 752 { 752 753 struct wireless_dev *wdev = dev->ieee80211_ptr; 753 754 int idx; ··· 780 783 781 784 return 0; 782 785 } 783 - EXPORT_SYMBOL_GPL(cfg80211_wext_giwencode); 784 786 785 - int cfg80211_wext_siwfreq(struct net_device *dev, 786 - struct iw_request_info *info, 787 - struct iw_freq *wextfreq, char *extra) 787 + static int cfg80211_wext_siwfreq(struct net_device *dev, 788 + struct iw_request_info *info, 789 + struct iw_freq *wextfreq, char *extra) 788 790 { 789 791 struct wireless_dev *wdev = dev->ieee80211_ptr; 790 792 struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy); ··· 812 816 return -EOPNOTSUPP; 813 817 } 814 818 } 815 - EXPORT_SYMBOL_GPL(cfg80211_wext_siwfreq); 816 819 817 - int cfg80211_wext_giwfreq(struct net_device *dev, 818 - struct iw_request_info *info, 819 - struct iw_freq *freq, char *extra) 820 + static int cfg80211_wext_giwfreq(struct net_device *dev, 821 + struct iw_request_info *info, 822 + struct iw_freq *freq, char *extra) 820 823 { 821 824 struct wireless_dev *wdev = dev->ieee80211_ptr; 822 825 ··· 832 837 return 0; 833 838 } 834 839 } 835 - EXPORT_SYMBOL_GPL(cfg80211_wext_giwfreq); 836 840 837 - int cfg80211_wext_siwtxpower(struct net_device *dev, 838 - struct iw_request_info *info, 839 - union iwreq_data *data, char *extra) 841 + static int cfg80211_wext_siwtxpower(struct net_device *dev, 842 + struct iw_request_info *info, 843 + union iwreq_data *data, char *extra) 840 844 { 841 845 struct wireless_dev *wdev = dev->ieee80211_ptr; 842 846 struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy); ··· 884 890 885 891 return rdev->ops->set_tx_power(wdev->wiphy, type, DBM_TO_MBM(dbm)); 886 892 } 887 - EXPORT_SYMBOL_GPL(cfg80211_wext_siwtxpower); 888 893 889 - int cfg80211_wext_giwtxpower(struct net_device *dev, 890 - struct iw_request_info *info, 891 - union iwreq_data *data, char *extra) 894 + static int cfg80211_wext_giwtxpower(struct net_device *dev, 895 + struct iw_request_info *info, 896 + union iwreq_data *data, char *extra) 892 897 { 893 898 struct wireless_dev *wdev = dev->ieee80211_ptr; 894 899 struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy); ··· 913 920 914 921 return 0; 915 922 } 916 - EXPORT_SYMBOL_GPL(cfg80211_wext_giwtxpower); 917 923 918 924 static int cfg80211_set_auth_alg(struct wireless_dev *wdev, 919 925 s32 auth_alg) ··· 1063 1071 return 0; 1064 1072 } 1065 1073 1066 - int cfg80211_wext_siwauth(struct net_device *dev, 1067 - struct iw_request_info *info, 1068 - struct iw_param *data, char *extra) 1074 + static int cfg80211_wext_siwauth(struct net_device *dev, 1075 + struct iw_request_info *info, 1076 + struct iw_param *data, char *extra) 1069 1077 { 1070 1078 struct wireless_dev *wdev = dev->ieee80211_ptr; 1071 1079 ··· 1095 1103 return -EOPNOTSUPP; 1096 1104 } 1097 1105 } 1098 - EXPORT_SYMBOL_GPL(cfg80211_wext_siwauth); 1099 1106 1100 - int cfg80211_wext_giwauth(struct net_device *dev, 1101 - struct iw_request_info *info, 1102 - struct iw_param *data, char *extra) 1107 + static int cfg80211_wext_giwauth(struct net_device *dev, 1108 + struct iw_request_info *info, 1109 + struct iw_param *data, char *extra) 1103 1110 { 1104 1111 /* XXX: what do we need? */ 1105 1112 1106 1113 return -EOPNOTSUPP; 1107 1114 } 1108 - EXPORT_SYMBOL_GPL(cfg80211_wext_giwauth); 1109 1115 1110 - int cfg80211_wext_siwpower(struct net_device *dev, 1111 - struct iw_request_info *info, 1112 - struct iw_param *wrq, char *extra) 1116 + static int cfg80211_wext_siwpower(struct net_device *dev, 1117 + struct iw_request_info *info, 1118 + struct iw_param *wrq, char *extra) 1113 1119 { 1114 1120 struct wireless_dev *wdev = dev->ieee80211_ptr; 1115 1121 struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy); ··· 1151 1161 return 0; 1152 1162 1153 1163 } 1154 - EXPORT_SYMBOL_GPL(cfg80211_wext_siwpower); 1155 1164 1156 - int cfg80211_wext_giwpower(struct net_device *dev, 1157 - struct iw_request_info *info, 1158 - struct iw_param *wrq, char *extra) 1165 + static int cfg80211_wext_giwpower(struct net_device *dev, 1166 + struct iw_request_info *info, 1167 + struct iw_param *wrq, char *extra) 1159 1168 { 1160 1169 struct wireless_dev *wdev = dev->ieee80211_ptr; 1161 1170 ··· 1162 1173 1163 1174 return 0; 1164 1175 } 1165 - EXPORT_SYMBOL_GPL(cfg80211_wext_giwpower); 1166 1176 1167 1177 static int cfg80211_wds_wext_siwap(struct net_device *dev, 1168 1178 struct iw_request_info *info, ··· 1207 1219 return 0; 1208 1220 } 1209 1221 1210 - int cfg80211_wext_siwrate(struct net_device *dev, 1211 - struct iw_request_info *info, 1212 - struct iw_param *rate, char *extra) 1222 + static int cfg80211_wext_siwrate(struct net_device *dev, 1223 + struct iw_request_info *info, 1224 + struct iw_param *rate, char *extra) 1213 1225 { 1214 1226 struct wireless_dev *wdev = dev->ieee80211_ptr; 1215 1227 struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy); ··· 1257 1269 1258 1270 return rdev->ops->set_bitrate_mask(wdev->wiphy, dev, NULL, &mask); 1259 1271 } 1260 - EXPORT_SYMBOL_GPL(cfg80211_wext_siwrate); 1261 1272 1262 - int cfg80211_wext_giwrate(struct net_device *dev, 1263 - struct iw_request_info *info, 1264 - struct iw_param *rate, char *extra) 1273 + static int cfg80211_wext_giwrate(struct net_device *dev, 1274 + struct iw_request_info *info, 1275 + struct iw_param *rate, char *extra) 1265 1276 { 1266 1277 struct wireless_dev *wdev = dev->ieee80211_ptr; 1267 1278 struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy); ··· 1296 1309 1297 1310 return 0; 1298 1311 } 1299 - EXPORT_SYMBOL_GPL(cfg80211_wext_giwrate); 1300 1312 1301 1313 /* Get wireless statistics. Called by /proc/net/wireless and by SIOCGIWSTATS */ 1302 - struct iw_statistics *cfg80211_wireless_stats(struct net_device *dev) 1314 + static struct iw_statistics *cfg80211_wireless_stats(struct net_device *dev) 1303 1315 { 1304 1316 struct wireless_dev *wdev = dev->ieee80211_ptr; 1305 1317 struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy); ··· 1363 1377 1364 1378 return &wstats; 1365 1379 } 1366 - EXPORT_SYMBOL_GPL(cfg80211_wireless_stats); 1367 1380 1368 - int cfg80211_wext_siwap(struct net_device *dev, 1369 - struct iw_request_info *info, 1370 - struct sockaddr *ap_addr, char *extra) 1381 + static int cfg80211_wext_siwap(struct net_device *dev, 1382 + struct iw_request_info *info, 1383 + struct sockaddr *ap_addr, char *extra) 1371 1384 { 1372 1385 struct wireless_dev *wdev = dev->ieee80211_ptr; 1373 1386 ··· 1381 1396 return -EOPNOTSUPP; 1382 1397 } 1383 1398 } 1384 - EXPORT_SYMBOL_GPL(cfg80211_wext_siwap); 1385 1399 1386 - int cfg80211_wext_giwap(struct net_device *dev, 1387 - struct iw_request_info *info, 1388 - struct sockaddr *ap_addr, char *extra) 1400 + static int cfg80211_wext_giwap(struct net_device *dev, 1401 + struct iw_request_info *info, 1402 + struct sockaddr *ap_addr, char *extra) 1389 1403 { 1390 1404 struct wireless_dev *wdev = dev->ieee80211_ptr; 1391 1405 ··· 1399 1415 return -EOPNOTSUPP; 1400 1416 } 1401 1417 } 1402 - EXPORT_SYMBOL_GPL(cfg80211_wext_giwap); 1403 1418 1404 - int cfg80211_wext_siwessid(struct net_device *dev, 1405 - struct iw_request_info *info, 1406 - struct iw_point *data, char *ssid) 1419 + static int cfg80211_wext_siwessid(struct net_device *dev, 1420 + struct iw_request_info *info, 1421 + struct iw_point *data, char *ssid) 1407 1422 { 1408 1423 struct wireless_dev *wdev = dev->ieee80211_ptr; 1409 1424 ··· 1415 1432 return -EOPNOTSUPP; 1416 1433 } 1417 1434 } 1418 - EXPORT_SYMBOL_GPL(cfg80211_wext_siwessid); 1419 1435 1420 - int cfg80211_wext_giwessid(struct net_device *dev, 1421 - struct iw_request_info *info, 1422 - struct iw_point *data, char *ssid) 1436 + static int cfg80211_wext_giwessid(struct net_device *dev, 1437 + struct iw_request_info *info, 1438 + struct iw_point *data, char *ssid) 1423 1439 { 1424 1440 struct wireless_dev *wdev = dev->ieee80211_ptr; 1425 1441 ··· 1434 1452 return -EOPNOTSUPP; 1435 1453 } 1436 1454 } 1437 - EXPORT_SYMBOL_GPL(cfg80211_wext_giwessid); 1438 1455 1439 - int cfg80211_wext_siwpmksa(struct net_device *dev, 1440 - struct iw_request_info *info, 1441 - struct iw_point *data, char *extra) 1456 + static int cfg80211_wext_siwpmksa(struct net_device *dev, 1457 + struct iw_request_info *info, 1458 + struct iw_point *data, char *extra) 1442 1459 { 1443 1460 struct wireless_dev *wdev = dev->ieee80211_ptr; 1444 1461 struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy); ··· 1475 1494 return -EOPNOTSUPP; 1476 1495 } 1477 1496 } 1478 - EXPORT_SYMBOL_GPL(cfg80211_wext_siwpmksa); 1479 1497 1480 1498 static const iw_handler cfg80211_handlers[] = { 1481 1499 [IW_IOCTL_IDX(SIOCGIWNAME)] = (iw_handler) cfg80211_wext_giwname,

net/wireless/wext-compat.h

··· 42 42 struct iw_request_info *info, 43 43 struct iw_point *data, char *ssid); 44 44 45 + int cfg80211_wext_siwmlme(struct net_device *dev, 46 + struct iw_request_info *info, 47 + struct iw_point *data, char *extra); 48 + int cfg80211_wext_siwgenie(struct net_device *dev, 49 + struct iw_request_info *info, 50 + struct iw_point *data, char *extra); 51 + 52 + 45 53 int cfg80211_wext_freq(struct wiphy *wiphy, struct iw_freq *freq); 46 54 47 55

-2

net/wireless/wext-sme.c

··· 366 366 wdev_unlock(wdev); 367 367 return err; 368 368 } 369 - EXPORT_SYMBOL_GPL(cfg80211_wext_siwgenie); 370 369 371 370 int cfg80211_wext_siwmlme(struct net_device *dev, 372 371 struct iw_request_info *info, ··· 402 403 403 404 return err; 404 405 } 405 - EXPORT_SYMBOL_GPL(cfg80211_wext_siwmlme);