diff options
-rw-r--r-- | include/net/ieee80211.h | 8 | ||||
-rw-r--r-- | net/ieee80211/ieee80211_wx.c | 89 |
2 files changed, 0 insertions, 97 deletions
diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h index facd0ffedc6..b31399e1fd8 100644 --- a/include/net/ieee80211.h +++ b/include/net/ieee80211.h | |||
@@ -1309,14 +1309,6 @@ extern int ieee80211_wx_set_encodeext(struct ieee80211_device *ieee, | |||
1309 | extern int ieee80211_wx_get_encodeext(struct ieee80211_device *ieee, | 1309 | extern int ieee80211_wx_get_encodeext(struct ieee80211_device *ieee, |
1310 | struct iw_request_info *info, | 1310 | struct iw_request_info *info, |
1311 | union iwreq_data *wrqu, char *extra); | 1311 | union iwreq_data *wrqu, char *extra); |
1312 | extern int ieee80211_wx_set_auth(struct net_device *dev, | ||
1313 | struct iw_request_info *info, | ||
1314 | union iwreq_data *wrqu, | ||
1315 | char *extra); | ||
1316 | extern int ieee80211_wx_get_auth(struct net_device *dev, | ||
1317 | struct iw_request_info *info, | ||
1318 | union iwreq_data *wrqu, | ||
1319 | char *extra); | ||
1320 | 1312 | ||
1321 | static inline void ieee80211_increment_scans(struct ieee80211_device *ieee) | 1313 | static inline void ieee80211_increment_scans(struct ieee80211_device *ieee) |
1322 | { | 1314 | { |
diff --git a/net/ieee80211/ieee80211_wx.c b/net/ieee80211/ieee80211_wx.c index 623489afa62..822606b615c 100644 --- a/net/ieee80211/ieee80211_wx.c +++ b/net/ieee80211/ieee80211_wx.c | |||
@@ -744,98 +744,9 @@ int ieee80211_wx_get_encodeext(struct ieee80211_device *ieee, | |||
744 | return 0; | 744 | return 0; |
745 | } | 745 | } |
746 | 746 | ||
747 | int ieee80211_wx_set_auth(struct net_device *dev, | ||
748 | struct iw_request_info *info, | ||
749 | union iwreq_data *wrqu, | ||
750 | char *extra) | ||
751 | { | ||
752 | struct ieee80211_device *ieee = netdev_priv(dev); | ||
753 | unsigned long flags; | ||
754 | int err = 0; | ||
755 | |||
756 | spin_lock_irqsave(&ieee->lock, flags); | ||
757 | |||
758 | switch (wrqu->param.flags & IW_AUTH_INDEX) { | ||
759 | case IW_AUTH_WPA_VERSION: | ||
760 | case IW_AUTH_CIPHER_PAIRWISE: | ||
761 | case IW_AUTH_CIPHER_GROUP: | ||
762 | case IW_AUTH_KEY_MGMT: | ||
763 | /* | ||
764 | * Host AP driver does not use these parameters and allows | ||
765 | * wpa_supplicant to control them internally. | ||
766 | */ | ||
767 | break; | ||
768 | case IW_AUTH_TKIP_COUNTERMEASURES: | ||
769 | break; /* FIXME */ | ||
770 | case IW_AUTH_DROP_UNENCRYPTED: | ||
771 | ieee->drop_unencrypted = !!wrqu->param.value; | ||
772 | break; | ||
773 | case IW_AUTH_80211_AUTH_ALG: | ||
774 | break; /* FIXME */ | ||
775 | case IW_AUTH_WPA_ENABLED: | ||
776 | ieee->privacy_invoked = ieee->wpa_enabled = !!wrqu->param.value; | ||
777 | break; | ||
778 | case IW_AUTH_RX_UNENCRYPTED_EAPOL: | ||
779 | ieee->ieee802_1x = !!wrqu->param.value; | ||
780 | break; | ||
781 | case IW_AUTH_PRIVACY_INVOKED: | ||
782 | ieee->privacy_invoked = !!wrqu->param.value; | ||
783 | break; | ||
784 | default: | ||
785 | err = -EOPNOTSUPP; | ||
786 | break; | ||
787 | } | ||
788 | spin_unlock_irqrestore(&ieee->lock, flags); | ||
789 | return err; | ||
790 | } | ||
791 | |||
792 | int ieee80211_wx_get_auth(struct net_device *dev, | ||
793 | struct iw_request_info *info, | ||
794 | union iwreq_data *wrqu, | ||
795 | char *extra) | ||
796 | { | ||
797 | struct ieee80211_device *ieee = netdev_priv(dev); | ||
798 | unsigned long flags; | ||
799 | int err = 0; | ||
800 | |||
801 | spin_lock_irqsave(&ieee->lock, flags); | ||
802 | |||
803 | switch (wrqu->param.flags & IW_AUTH_INDEX) { | ||
804 | case IW_AUTH_WPA_VERSION: | ||
805 | case IW_AUTH_CIPHER_PAIRWISE: | ||
806 | case IW_AUTH_CIPHER_GROUP: | ||
807 | case IW_AUTH_KEY_MGMT: | ||
808 | case IW_AUTH_TKIP_COUNTERMEASURES: /* FIXME */ | ||
809 | case IW_AUTH_80211_AUTH_ALG: /* FIXME */ | ||
810 | /* | ||
811 | * Host AP driver does not use these parameters and allows | ||
812 | * wpa_supplicant to control them internally. | ||
813 | */ | ||
814 | err = -EOPNOTSUPP; | ||
815 | break; | ||
816 | case IW_AUTH_DROP_UNENCRYPTED: | ||
817 | wrqu->param.value = ieee->drop_unencrypted; | ||
818 | break; | ||
819 | case IW_AUTH_WPA_ENABLED: | ||
820 | wrqu->param.value = ieee->wpa_enabled; | ||
821 | break; | ||
822 | case IW_AUTH_RX_UNENCRYPTED_EAPOL: | ||
823 | wrqu->param.value = ieee->ieee802_1x; | ||
824 | break; | ||
825 | default: | ||
826 | err = -EOPNOTSUPP; | ||
827 | break; | ||
828 | } | ||
829 | spin_unlock_irqrestore(&ieee->lock, flags); | ||
830 | return err; | ||
831 | } | ||
832 | |||
833 | EXPORT_SYMBOL(ieee80211_wx_set_encodeext); | 747 | EXPORT_SYMBOL(ieee80211_wx_set_encodeext); |
834 | EXPORT_SYMBOL(ieee80211_wx_get_encodeext); | 748 | EXPORT_SYMBOL(ieee80211_wx_get_encodeext); |
835 | 749 | ||
836 | EXPORT_SYMBOL(ieee80211_wx_get_scan); | 750 | EXPORT_SYMBOL(ieee80211_wx_get_scan); |
837 | EXPORT_SYMBOL(ieee80211_wx_set_encode); | 751 | EXPORT_SYMBOL(ieee80211_wx_set_encode); |
838 | EXPORT_SYMBOL(ieee80211_wx_get_encode); | 752 | EXPORT_SYMBOL(ieee80211_wx_get_encode); |
839 | |||
840 | EXPORT_SYMBOL_GPL(ieee80211_wx_set_auth); | ||
841 | EXPORT_SYMBOL_GPL(ieee80211_wx_get_auth); | ||