HDD: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: I0db9fde2d94cae77d944594c0b00c887295fe70d
CRs-Fixed: 769138
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index c98c16f..0fb491d 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -23,6 +23,7 @@
* This file was originally distributed by Qualcomm Atheros, Inc.
* under proprietary terms before Copyright ownership was assigned
* to the Linux Foundation.
+ *
*/
@@ -4694,7 +4695,7 @@
.flags = WIPHY_VENDOR_CMD_NEED_WDEV |
WIPHY_VENDOR_CMD_NEED_NETDEV |
WIPHY_VENDOR_CMD_NEED_RUNNING,
- .doit = (void *)wlan_hdd_cfg80211_firmware_roaming
+ .doit = wlan_hdd_cfg80211_firmware_roaming
},
#ifdef WLAN_FEATURE_LINK_LAYER_STATS
{
@@ -4703,7 +4704,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
},
{
@@ -4712,7 +4713,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
},
{
@@ -4721,7 +4722,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 WLAN_FEATURE_EXTSCAN
@@ -4731,7 +4732,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,
@@ -4739,14 +4740,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,
@@ -4754,7 +4755,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,
@@ -4762,7 +4763,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,
@@ -4770,7 +4771,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,
@@ -4778,7 +4779,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,
@@ -4786,7 +4787,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,
@@ -4794,7 +4795,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 /* WLAN_FEATURE_EXTSCAN */
/*EXT TDLS*/
@@ -4804,7 +4805,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,
@@ -4812,42 +4813,42 @@
.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
},
{
.info.vendor_id = QCA_NL80211_VENDOR_ID,
.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_NO_DFS_FLAG,
.flags = WIPHY_VENDOR_CMD_NEED_WDEV |
WIPHY_VENDOR_CMD_NEED_NETDEV,
- .doit = (void *)wlan_hdd_cfg80211_disable_dfs_channels
+ .doit = wlan_hdd_cfg80211_disable_dfs_channels
},
{
.info.vendor_id = QCA_NL80211_VENDOR_ID,
.info.subcmd = QCA_NL80211_VENDOR_SUBCMD_MAC_OUI,
.flags = WIPHY_VENDOR_CMD_NEED_WDEV |
WIPHY_VENDOR_CMD_NEED_NETDEV,
- .doit = (void *) wlan_hdd_cfg80211_set_spoofed_mac_oui
+ .doit = wlan_hdd_cfg80211_set_spoofed_mac_oui
},
{
.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
},
};