aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/net/mac80211.h21
-rw-r--r--net/mac80211/ieee80211_ioctl.c7
2 files changed, 1 insertions, 27 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index f13c378fde91..17b60391fcd6 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -941,27 +941,11 @@ enum ieee80211_erp_change_flags {
941 * and remove_interface calls, i.e. while the interface with the 941 * and remove_interface calls, i.e. while the interface with the
942 * given local_address is enabled. 942 * given local_address is enabled.
943 * 943 *
944 * @set_ieee8021x: Enable/disable IEEE 802.1X. This item requests wlan card
945 * to pass unencrypted EAPOL-Key frames even when encryption is
946 * configured. If the wlan card does not require such a configuration,
947 * this function pointer can be set to NULL.
948 *
949 * @set_port_auth: Set port authorization state (IEEE 802.1X PAE) to be
950 * authorized (@authorized=1) or unauthorized (=0). This function can be
951 * used if the wlan hardware or low-level driver implements PAE.
952 * mac80211 will filter frames based on authorization state in any case,
953 * so this function pointer can be NULL if low-level driver does not
954 * require event notification about port state changes.
955 *
956 * @hw_scan: Ask the hardware to service the scan request, no need to start 944 * @hw_scan: Ask the hardware to service the scan request, no need to start
957 * the scan state machine in stack. 945 * the scan state machine in stack.
958 * 946 *
959 * @get_stats: return low-level statistics 947 * @get_stats: return low-level statistics
960 * 948 *
961 * @set_privacy_invoked: For devices that generate their own beacons and probe
962 * response or association responses this updates the state of privacy_invoked
963 * returns 0 for success or an error number.
964 *
965 * @get_sequence_counter: For devices that have internal sequence counters this 949 * @get_sequence_counter: For devices that have internal sequence counters this
966 * callback allows mac80211 to access the current value of a counter. 950 * callback allows mac80211 to access the current value of a counter.
967 * This callback seems not well-defined, tell us if you need it. 951 * This callback seems not well-defined, tell us if you need it.
@@ -1034,14 +1018,9 @@ struct ieee80211_ops {
1034 int (*set_key)(struct ieee80211_hw *hw, enum set_key_cmd cmd, 1018 int (*set_key)(struct ieee80211_hw *hw, enum set_key_cmd cmd,
1035 const u8 *local_address, const u8 *address, 1019 const u8 *local_address, const u8 *address,
1036 struct ieee80211_key_conf *key); 1020 struct ieee80211_key_conf *key);
1037 int (*set_ieee8021x)(struct ieee80211_hw *hw, int use_ieee8021x);
1038 int (*set_port_auth)(struct ieee80211_hw *hw, u8 *addr,
1039 int authorized);
1040 int (*hw_scan)(struct ieee80211_hw *hw, u8 *ssid, size_t len); 1021 int (*hw_scan)(struct ieee80211_hw *hw, u8 *ssid, size_t len);
1041 int (*get_stats)(struct ieee80211_hw *hw, 1022 int (*get_stats)(struct ieee80211_hw *hw,
1042 struct ieee80211_low_level_stats *stats); 1023 struct ieee80211_low_level_stats *stats);
1043 int (*set_privacy_invoked)(struct ieee80211_hw *hw,
1044 int privacy_invoked);
1045 int (*get_sequence_counter)(struct ieee80211_hw *hw, 1024 int (*get_sequence_counter)(struct ieee80211_hw *hw,
1046 u8* addr, u8 keyidx, u8 txrx, 1025 u8* addr, u8 keyidx, u8 txrx,
1047 u32* iv32, u16* iv16); 1026 u32* iv32, u16* iv16);
diff --git a/net/mac80211/ieee80211_ioctl.c b/net/mac80211/ieee80211_ioctl.c
index 6caa3ec2cff7..3645660a364a 100644
--- a/net/mac80211/ieee80211_ioctl.c
+++ b/net/mac80211/ieee80211_ioctl.c
@@ -917,7 +917,6 @@ static int ieee80211_ioctl_siwauth(struct net_device *dev,
917 struct iw_request_info *info, 917 struct iw_request_info *info,
918 struct iw_param *data, char *extra) 918 struct iw_param *data, char *extra)
919{ 919{
920 struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
921 struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); 920 struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
922 int ret = 0; 921 int ret = 0;
923 922
@@ -927,6 +926,7 @@ static int ieee80211_ioctl_siwauth(struct net_device *dev,
927 case IW_AUTH_CIPHER_GROUP: 926 case IW_AUTH_CIPHER_GROUP:
928 case IW_AUTH_WPA_ENABLED: 927 case IW_AUTH_WPA_ENABLED:
929 case IW_AUTH_RX_UNENCRYPTED_EAPOL: 928 case IW_AUTH_RX_UNENCRYPTED_EAPOL:
929 case IW_AUTH_PRIVACY_INVOKED:
930 break; 930 break;
931 case IW_AUTH_KEY_MGMT: 931 case IW_AUTH_KEY_MGMT:
932 if (sdata->type != IEEE80211_IF_TYPE_STA) 932 if (sdata->type != IEEE80211_IF_TYPE_STA)
@@ -948,11 +948,6 @@ static int ieee80211_ioctl_siwauth(struct net_device *dev,
948 else 948 else
949 ret = -EOPNOTSUPP; 949 ret = -EOPNOTSUPP;
950 break; 950 break;
951 case IW_AUTH_PRIVACY_INVOKED:
952 if (local->ops->set_privacy_invoked)
953 ret = local->ops->set_privacy_invoked(
954 local_to_hw(local), data->value);
955 break;
956 default: 951 default:
957 ret = -EOPNOTSUPP; 952 ret = -EOPNOTSUPP;
958 break; 953 break;