diff options
Diffstat (limited to 'drivers/net/wireless/mwifiex/main.h')
-rw-r--r-- | drivers/net/wireless/mwifiex/main.h | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/drivers/net/wireless/mwifiex/main.h b/drivers/net/wireless/mwifiex/main.h index 9e636535cbf6..e7c2a82fd610 100644 --- a/drivers/net/wireless/mwifiex/main.h +++ b/drivers/net/wireless/mwifiex/main.h | |||
@@ -678,7 +678,6 @@ struct mwifiex_adapter { | |||
678 | u8 hw_dev_mcs_support; | 678 | u8 hw_dev_mcs_support; |
679 | u8 adhoc_11n_enabled; | 679 | u8 adhoc_11n_enabled; |
680 | u8 sec_chan_offset; | 680 | u8 sec_chan_offset; |
681 | enum nl80211_channel_type channel_type; | ||
682 | struct mwifiex_dbg dbg; | 681 | struct mwifiex_dbg dbg; |
683 | u8 arp_filter[ARP_FILTER_MAX_BUF_SIZE]; | 682 | u8 arp_filter[ARP_FILTER_MAX_BUF_SIZE]; |
684 | u32 arp_filter_size; | 683 | u32 arp_filter_size; |
@@ -824,9 +823,7 @@ int mwifiex_cmd_append_vsie_tlv(struct mwifiex_private *priv, u16 vsie_mask, | |||
824 | u32 mwifiex_get_active_data_rates(struct mwifiex_private *priv, | 823 | u32 mwifiex_get_active_data_rates(struct mwifiex_private *priv, |
825 | u8 *rates); | 824 | u8 *rates); |
826 | u32 mwifiex_get_supported_rates(struct mwifiex_private *priv, u8 *rates); | 825 | u32 mwifiex_get_supported_rates(struct mwifiex_private *priv, u8 *rates); |
827 | u8 mwifiex_data_rate_to_index(u32 rate); | ||
828 | u8 mwifiex_is_rate_auto(struct mwifiex_private *priv); | 826 | u8 mwifiex_is_rate_auto(struct mwifiex_private *priv); |
829 | int mwifiex_get_rate_index(u16 *rateBitmap, int size); | ||
830 | extern u16 region_code_index[MWIFIEX_MAX_REGION_CODE]; | 827 | extern u16 region_code_index[MWIFIEX_MAX_REGION_CODE]; |
831 | void mwifiex_save_curr_bcn(struct mwifiex_private *priv); | 828 | void mwifiex_save_curr_bcn(struct mwifiex_private *priv); |
832 | void mwifiex_free_curr_bcn(struct mwifiex_private *priv); | 829 | void mwifiex_free_curr_bcn(struct mwifiex_private *priv); |
@@ -945,16 +942,13 @@ int mwifiex_bss_start(struct mwifiex_private *priv, struct cfg80211_bss *bss, | |||
945 | int mwifiex_cancel_hs(struct mwifiex_private *priv, int cmd_type); | 942 | int mwifiex_cancel_hs(struct mwifiex_private *priv, int cmd_type); |
946 | int mwifiex_enable_hs(struct mwifiex_adapter *adapter); | 943 | int mwifiex_enable_hs(struct mwifiex_adapter *adapter); |
947 | int mwifiex_disable_auto_ds(struct mwifiex_private *priv); | 944 | int mwifiex_disable_auto_ds(struct mwifiex_private *priv); |
948 | int mwifiex_drv_get_data_rate(struct mwifiex_private *priv, | 945 | int mwifiex_drv_get_data_rate(struct mwifiex_private *priv, u32 *rate); |
949 | struct mwifiex_rate_cfg *rate); | ||
950 | int mwifiex_request_scan(struct mwifiex_private *priv, | 946 | int mwifiex_request_scan(struct mwifiex_private *priv, |
951 | struct cfg80211_ssid *req_ssid); | 947 | struct cfg80211_ssid *req_ssid); |
952 | int mwifiex_scan_networks(struct mwifiex_private *priv, | 948 | int mwifiex_scan_networks(struct mwifiex_private *priv, |
953 | const struct mwifiex_user_scan_cfg *user_scan_in); | 949 | const struct mwifiex_user_scan_cfg *user_scan_in); |
954 | int mwifiex_set_radio(struct mwifiex_private *priv, u8 option); | 950 | int mwifiex_set_radio(struct mwifiex_private *priv, u8 option); |
955 | 951 | ||
956 | int mwifiex_drv_change_adhoc_chan(struct mwifiex_private *priv, u16 channel); | ||
957 | |||
958 | int mwifiex_set_encode(struct mwifiex_private *priv, const u8 *key, | 952 | int mwifiex_set_encode(struct mwifiex_private *priv, const u8 *key, |
959 | int key_len, u8 key_index, const u8 *mac_addr, | 953 | int key_len, u8 key_index, const u8 *mac_addr, |
960 | int disable); | 954 | int disable); |
@@ -993,8 +987,6 @@ int mwifiex_set_tx_power(struct mwifiex_private *priv, | |||
993 | 987 | ||
994 | int mwifiex_main_process(struct mwifiex_adapter *); | 988 | int mwifiex_main_process(struct mwifiex_adapter *); |
995 | 989 | ||
996 | int mwifiex_bss_set_channel(struct mwifiex_private *, | ||
997 | struct mwifiex_chan_freq_power *cfp); | ||
998 | int mwifiex_get_bss_info(struct mwifiex_private *, | 990 | int mwifiex_get_bss_info(struct mwifiex_private *, |
999 | struct mwifiex_bss_info *); | 991 | struct mwifiex_bss_info *); |
1000 | int mwifiex_fill_new_bss_desc(struct mwifiex_private *priv, | 992 | int mwifiex_fill_new_bss_desc(struct mwifiex_private *priv, |
@@ -1005,10 +997,12 @@ int mwifiex_update_bss_desc_with_ie(struct mwifiex_adapter *adapter, | |||
1005 | int mwifiex_check_network_compatibility(struct mwifiex_private *priv, | 997 | int mwifiex_check_network_compatibility(struct mwifiex_private *priv, |
1006 | struct mwifiex_bssdescriptor *bss_desc); | 998 | struct mwifiex_bssdescriptor *bss_desc); |
1007 | 999 | ||
1008 | struct net_device *mwifiex_add_virtual_intf(struct wiphy *wiphy, | 1000 | struct wireless_dev *mwifiex_add_virtual_intf(struct wiphy *wiphy, |
1009 | char *name, enum nl80211_iftype type, | 1001 | char *name, |
1010 | u32 *flags, struct vif_params *params); | 1002 | enum nl80211_iftype type, |
1011 | int mwifiex_del_virtual_intf(struct wiphy *wiphy, struct net_device *dev); | 1003 | u32 *flags, |
1004 | struct vif_params *params); | ||
1005 | int mwifiex_del_virtual_intf(struct wiphy *wiphy, struct wireless_dev *wdev); | ||
1012 | 1006 | ||
1013 | void mwifiex_set_sys_config_invalid_data(struct mwifiex_uap_bss_param *config); | 1007 | void mwifiex_set_sys_config_invalid_data(struct mwifiex_uap_bss_param *config); |
1014 | 1008 | ||