qcacld: expect correct definition of struct wiphy_vendor_command
When the nl80211 vendor command support was backported to 3.10, it was
backported with a flaw in struct wiphy_vendor_command. Previously
change "qcacld: handle correct definition of struct
wiphy_vendor_command" modified the WLAN driver so that it could
operate with both the flawed definition and the correct definition.
Now that the correct definition has been mainlined, update the driver
to remove the typecasting that was added to allow the driver to work
with the flawed definition.
Change-Id: I338fa75e3a89c0f230d0d60e8296277841ba2f31
CRs-Fixed: 769130
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index a2e1f4f..c51b21e 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -5126,7 +5126,7 @@
.flags = WIPHY_VENDOR_CMD_NEED_WDEV |
WIPHY_VENDOR_CMD_NEED_NETDEV |
WIPHY_VENDOR_CMD_NEED_RUNNING,
- .doit = (void *)is_driver_dfs_capable
+ .doit = is_driver_dfs_capable
},
#ifdef WLAN_FEATURE_NAN
@@ -5136,7 +5136,7 @@
.flags = WIPHY_VENDOR_CMD_NEED_WDEV |
WIPHY_VENDOR_CMD_NEED_NETDEV |
WIPHY_VENDOR_CMD_NEED_RUNNING,
- .doit = (void *)wlan_hdd_cfg80211_nan_request
+ .doit = wlan_hdd_cfg80211_nan_request
},
#endif
@@ -5147,7 +5147,7 @@
.flags = WIPHY_VENDOR_CMD_NEED_WDEV |
WIPHY_VENDOR_CMD_NEED_NETDEV |
WIPHY_VENDOR_CMD_NEED_RUNNING,
- .doit = (void *)wlan_hdd_cfg80211_stats_ext_request
+ .doit = wlan_hdd_cfg80211_stats_ext_request
},
#endif
#ifdef FEATURE_WLAN_EXTSCAN
@@ -5157,7 +5157,7 @@
.flags = WIPHY_VENDOR_CMD_NEED_WDEV |
WIPHY_VENDOR_CMD_NEED_NETDEV |
WIPHY_VENDOR_CMD_NEED_RUNNING,
- .doit = (void *)wlan_hdd_cfg80211_extscan_start
+ .doit = wlan_hdd_cfg80211_extscan_start
},
{
.info.vendor_id = QCA_NL80211_VENDOR_ID,
@@ -5165,14 +5165,14 @@
.flags = WIPHY_VENDOR_CMD_NEED_WDEV |
WIPHY_VENDOR_CMD_NEED_NETDEV |
WIPHY_VENDOR_CMD_NEED_RUNNING,
- .doit = (void *)wlan_hdd_cfg80211_extscan_stop
+ .doit = wlan_hdd_cfg80211_extscan_stop
},
{
.info.vendor_id = QCA_NL80211_VENDOR_ID,
.info.subcmd = QCA_NL80211_VENDOR_SUBCMD_EXTSCAN_GET_VALID_CHANNELS,
.flags = WIPHY_VENDOR_CMD_NEED_WDEV |
WIPHY_VENDOR_CMD_NEED_NETDEV,
- .doit = (void *)wlan_hdd_cfg80211_extscan_get_valid_channels
+ .doit = wlan_hdd_cfg80211_extscan_get_valid_channels
},
{
.info.vendor_id = QCA_NL80211_VENDOR_ID,
@@ -5180,7 +5180,7 @@
.flags = WIPHY_VENDOR_CMD_NEED_WDEV |
WIPHY_VENDOR_CMD_NEED_NETDEV |
WIPHY_VENDOR_CMD_NEED_RUNNING,
- .doit = (void *)wlan_hdd_cfg80211_extscan_get_capabilities
+ .doit = wlan_hdd_cfg80211_extscan_get_capabilities
},
{
.info.vendor_id = QCA_NL80211_VENDOR_ID,
@@ -5188,7 +5188,7 @@
.flags = WIPHY_VENDOR_CMD_NEED_WDEV |
WIPHY_VENDOR_CMD_NEED_NETDEV |
WIPHY_VENDOR_CMD_NEED_RUNNING,
- .doit = (void *)wlan_hdd_cfg80211_extscan_get_cached_results
+ .doit = wlan_hdd_cfg80211_extscan_get_cached_results
},
{
.info.vendor_id = QCA_NL80211_VENDOR_ID,
@@ -5196,7 +5196,7 @@
.flags = WIPHY_VENDOR_CMD_NEED_WDEV |
WIPHY_VENDOR_CMD_NEED_NETDEV |
WIPHY_VENDOR_CMD_NEED_RUNNING,
- .doit = (void *)wlan_hdd_cfg80211_extscan_set_bssid_hotlist
+ .doit = wlan_hdd_cfg80211_extscan_set_bssid_hotlist
},
{
.info.vendor_id = QCA_NL80211_VENDOR_ID,
@@ -5204,7 +5204,7 @@
.flags = WIPHY_VENDOR_CMD_NEED_WDEV |
WIPHY_VENDOR_CMD_NEED_NETDEV |
WIPHY_VENDOR_CMD_NEED_RUNNING,
- .doit = (void *)wlan_hdd_cfg80211_extscan_reset_bssid_hotlist
+ .doit = wlan_hdd_cfg80211_extscan_reset_bssid_hotlist
},
{
.info.vendor_id = QCA_NL80211_VENDOR_ID,
@@ -5212,7 +5212,7 @@
.flags = WIPHY_VENDOR_CMD_NEED_WDEV |
WIPHY_VENDOR_CMD_NEED_NETDEV |
WIPHY_VENDOR_CMD_NEED_RUNNING,
- .doit = (void *)wlan_hdd_cfg80211_extscan_set_significant_change
+ .doit = wlan_hdd_cfg80211_extscan_set_significant_change
},
{
.info.vendor_id = QCA_NL80211_VENDOR_ID,
@@ -5220,7 +5220,7 @@
.flags = WIPHY_VENDOR_CMD_NEED_WDEV |
WIPHY_VENDOR_CMD_NEED_NETDEV |
WIPHY_VENDOR_CMD_NEED_RUNNING,
- .doit = (void *)wlan_hdd_cfg80211_extscan_reset_significant_change
+ .doit = wlan_hdd_cfg80211_extscan_reset_significant_change
},
#endif /* FEATURE_WLAN_EXTSCAN */
@@ -5231,7 +5231,7 @@
.flags = WIPHY_VENDOR_CMD_NEED_WDEV |
WIPHY_VENDOR_CMD_NEED_NETDEV |
WIPHY_VENDOR_CMD_NEED_RUNNING,
- .doit = (void *)wlan_hdd_cfg80211_ll_stats_clear
+ .doit = wlan_hdd_cfg80211_ll_stats_clear
},
{
@@ -5240,7 +5240,7 @@
.flags = WIPHY_VENDOR_CMD_NEED_WDEV |
WIPHY_VENDOR_CMD_NEED_NETDEV |
WIPHY_VENDOR_CMD_NEED_RUNNING,
- .doit = (void *)wlan_hdd_cfg80211_ll_stats_set
+ .doit = wlan_hdd_cfg80211_ll_stats_set
},
{
@@ -5249,7 +5249,7 @@
.flags = WIPHY_VENDOR_CMD_NEED_WDEV |
WIPHY_VENDOR_CMD_NEED_NETDEV |
WIPHY_VENDOR_CMD_NEED_RUNNING,
- .doit = (void *)wlan_hdd_cfg80211_ll_stats_get
+ .doit = wlan_hdd_cfg80211_ll_stats_get
},
#endif /* WLAN_FEATURE_LINK_LAYER_STATS */
#ifdef FEATURE_WLAN_TDLS
@@ -5260,7 +5260,7 @@
.flags = WIPHY_VENDOR_CMD_NEED_WDEV |
WIPHY_VENDOR_CMD_NEED_NETDEV |
WIPHY_VENDOR_CMD_NEED_RUNNING,
- .doit = (void *)wlan_hdd_cfg80211_exttdls_enable
+ .doit = wlan_hdd_cfg80211_exttdls_enable
},
{
.info.vendor_id = QCA_NL80211_VENDOR_ID,
@@ -5268,14 +5268,14 @@
.flags = WIPHY_VENDOR_CMD_NEED_WDEV |
WIPHY_VENDOR_CMD_NEED_NETDEV |
WIPHY_VENDOR_CMD_NEED_RUNNING,
- .doit = (void *)wlan_hdd_cfg80211_exttdls_disable
+ .doit = wlan_hdd_cfg80211_exttdls_disable
},
{
.info.vendor_id = QCA_NL80211_VENDOR_ID,
.info.subcmd = QCA_NL80211_VENDOR_SUBCMD_TDLS_GET_STATUS,
.flags = WIPHY_VENDOR_CMD_NEED_WDEV |
WIPHY_VENDOR_CMD_NEED_NETDEV,
- .doit = (void *)wlan_hdd_cfg80211_exttdls_get_status
+ .doit = wlan_hdd_cfg80211_exttdls_get_status
},
#endif
{
@@ -5283,28 +5283,28 @@
.info.subcmd = QCA_NL80211_VENDOR_SUBCMD_GET_SUPPORTED_FEATURES,
.flags = WIPHY_VENDOR_CMD_NEED_WDEV |
WIPHY_VENDOR_CMD_NEED_NETDEV,
- .doit = (void *)wlan_hdd_cfg80211_get_supported_features
+ .doit = wlan_hdd_cfg80211_get_supported_features
},
{
.info.vendor_id = QCA_NL80211_VENDOR_ID,
.info.subcmd = QCA_NL80211_VENDOR_SUBCMD_SCANNING_MAC_OUI,
.flags = WIPHY_VENDOR_CMD_NEED_WDEV |
WIPHY_VENDOR_CMD_NEED_NETDEV,
- .doit = (void *)wlan_hdd_cfg80211_set_scanning_mac_oui
+ .doit = wlan_hdd_cfg80211_set_scanning_mac_oui
},
{
.info.vendor_id = QCA_NL80211_VENDOR_ID,
.info.subcmd = QCA_NL80211_VENDOR_SUBCMD_NO_DFS_FLAG,
.flags = WIPHY_VENDOR_CMD_NEED_WDEV |
WIPHY_VENDOR_CMD_NEED_NETDEV,
- .doit = (void *)wlan_hdd_cfg80211_disable_dfs_chan_scan
+ .doit = wlan_hdd_cfg80211_disable_dfs_chan_scan
},
{
.info.vendor_id = QCA_NL80211_VENDOR_ID,
.info.subcmd = QCA_NL80211_VENDOR_SUBCMD_GET_CONCURRENCY_MATRIX,
.flags = WIPHY_VENDOR_CMD_NEED_WDEV |
WIPHY_VENDOR_CMD_NEED_NETDEV,
- .doit = (void *)wlan_hdd_cfg80211_get_concurrency_matrix
+ .doit = wlan_hdd_cfg80211_get_concurrency_matrix
},
#ifdef WLAN_FEATURE_APFIND
{
@@ -5312,7 +5312,7 @@
.info.subcmd = QCA_NL80211_VENDOR_SUBCMD_APFIND,
.flags = WIPHY_VENDOR_CMD_NEED_WDEV |
WIPHY_VENDOR_CMD_NEED_NETDEV,
- .doit = (void *)wlan_hdd_cfg80211_apfind_cmd
+ .doit = wlan_hdd_cfg80211_apfind_cmd
},
#endif /* WLAN_FEATURE_APFIND */
@@ -5323,7 +5323,7 @@
.flags = WIPHY_VENDOR_CMD_NEED_WDEV |
WIPHY_VENDOR_CMD_NEED_NETDEV |
WIPHY_VENDOR_CMD_NEED_RUNNING,
- .doit = (void *)wlan_hdd_cfg80211_do_acs
+ .doit = wlan_hdd_cfg80211_do_acs
},
#endif
{
@@ -5332,14 +5332,14 @@
.flags = WIPHY_VENDOR_CMD_NEED_WDEV |
WIPHY_VENDOR_CMD_NEED_NETDEV |
WIPHY_VENDOR_CMD_NEED_RUNNING,
- .doit = (void *)wlan_hdd_cfg80211_ocb_set_schedule
+ .doit = wlan_hdd_cfg80211_ocb_set_schedule
},
{
.info.vendor_id = QCA_NL80211_VENDOR_ID,
.info.subcmd = QCA_NL80211_VENDOR_SUBCMD_GET_FEATURES,
.flags = WIPHY_VENDOR_CMD_NEED_WDEV |
WIPHY_VENDOR_CMD_NEED_NETDEV,
- .doit = (void *)wlan_hdd_cfg80211_get_features
+ .doit = wlan_hdd_cfg80211_get_features
},
#ifdef WLAN_FEATURE_ROAM_OFFLOAD
{
@@ -5348,7 +5348,7 @@
.flags = WIPHY_VENDOR_CMD_NEED_WDEV |
WIPHY_VENDOR_CMD_NEED_NETDEV |
WIPHY_VENDOR_CMD_NEED_RUNNING,
- .doit = (void *)wlan_hdd_cfg80211_keymgmt_set_key
+ .doit = wlan_hdd_cfg80211_keymgmt_set_key
},
#endif
};
