Browse Source

qcacld-3.0: Remove SSR protect (vdev ioctls)

As part of DSC integration cleanup, remove SSR protection from IOCTLs
where vdev op start/stop protection is also in place.

Change-Id: I27c29ba73fe5bb1248c85b4a3d2ab457a4b791d0
CRs-Fixed: 2404907
Dustin Brown 6 years ago
parent
commit
b55242077d

+ 0 - 2
core/hdd/src/wlan_hdd_fips.c

@@ -287,9 +287,7 @@ int hdd_fips_test(struct net_device *dev,
 	if (errno)
 		return errno;
 
-	cds_ssr_protect(__func__);
 	errno = __hdd_fips_test(dev, info, wrqu, extra);
-	cds_ssr_unprotect(__func__);
 
 	osif_vdev_sync_op_stop(vdev_sync);
 

+ 0 - 44
core/hdd/src/wlan_hdd_hostapd_wext.c

@@ -113,9 +113,7 @@ static iw_softap_set_ini_cfg(struct net_device *dev,
 	if (errno)
 		return errno;
 
-	cds_ssr_protect(__func__);
 	errno = __iw_softap_set_ini_cfg(dev, info, wrqu, extra);
-	cds_ssr_unprotect(__func__);
 
 	osif_vdev_sync_op_stop(vdev_sync);
 
@@ -182,9 +180,7 @@ static iw_softap_get_ini_cfg(struct net_device *dev,
 	if (errno)
 		return errno;
 
-	cds_ssr_protect(__func__);
 	errno = __iw_softap_get_ini_cfg(dev, info, wrqu, extra);
-	cds_ssr_unprotect(__func__);
 
 	osif_vdev_sync_op_stop(vdev_sync);
 
@@ -326,9 +322,7 @@ static int iw_softap_set_two_ints_getnone(struct net_device *dev,
 	if (errno)
 		return errno;
 
-	cds_ssr_protect(__func__);
 	errno = __iw_softap_set_two_ints_getnone(dev, info, wrqu, extra);
-	cds_ssr_unprotect(__func__);
 
 	osif_vdev_sync_op_stop(vdev_sync);
 
@@ -1226,9 +1220,7 @@ static int iw_softap_get_three(struct net_device *dev,
 	if (errno)
 		return errno;
 
-	cds_ssr_protect(__func__);
 	errno = __iw_softap_get_three(dev, info, wrqu, extra);
-	cds_ssr_unprotect(__func__);
 
 	osif_vdev_sync_op_stop(vdev_sync);
 
@@ -1247,9 +1239,7 @@ static iw_softap_setparam(struct net_device *dev,
 	if (errno)
 		return errno;
 
-	cds_ssr_protect(__func__);
 	errno = __iw_softap_setparam(dev, info, wrqu, extra);
-	cds_ssr_unprotect(__func__);
 
 	osif_vdev_sync_op_stop(vdev_sync);
 
@@ -1506,9 +1496,7 @@ static iw_softap_getparam(struct net_device *dev,
 	if (errno)
 		return errno;
 
-	cds_ssr_protect(__func__);
 	errno = __iw_softap_getparam(dev, info, wrqu, extra);
-	cds_ssr_unprotect(__func__);
 
 	osif_vdev_sync_op_stop(vdev_sync);
 
@@ -1592,9 +1580,7 @@ int iw_softap_modify_acl(struct net_device *dev,
 	if (errno)
 		return errno;
 
-	cds_ssr_protect(__func__);
 	errno = __iw_softap_modify_acl(dev, info, wrqu, extra);
-	cds_ssr_unprotect(__func__);
 
 	osif_vdev_sync_op_stop(vdev_sync);
 
@@ -1642,9 +1628,7 @@ static iw_softap_getchannel(struct net_device *dev,
 	if (errno)
 		return errno;
 
-	cds_ssr_protect(__func__);
 	errno = __iw_softap_getchannel(dev, info, wrqu, extra);
-	cds_ssr_unprotect(__func__);
 
 	osif_vdev_sync_op_stop(vdev_sync);
 
@@ -1705,9 +1689,7 @@ static iw_softap_set_max_tx_power(struct net_device *dev,
 	if (errno)
 		return errno;
 
-	cds_ssr_protect(__func__);
 	errno = __iw_softap_set_max_tx_power(dev, info, wrqu, extra);
-	cds_ssr_unprotect(__func__);
 
 	osif_vdev_sync_op_stop(vdev_sync);
 
@@ -1752,9 +1734,7 @@ static iw_softap_set_pktlog(struct net_device *dev,
 	if (errno)
 		return errno;
 
-	cds_ssr_protect(__func__);
 	errno = __iw_softap_set_pktlog(dev, info, wrqu, extra);
-	cds_ssr_unprotect(__func__);
 
 	osif_vdev_sync_op_stop(vdev_sync);
 
@@ -1818,9 +1798,7 @@ static iw_softap_set_tx_power(struct net_device *dev,
 	if (errno)
 		return errno;
 
-	cds_ssr_protect(__func__);
 	errno = __iw_softap_set_tx_power(dev, info, wrqu, extra);
-	cds_ssr_unprotect(__func__);
 
 	osif_vdev_sync_op_stop(vdev_sync);
 
@@ -1919,9 +1897,7 @@ static iw_softap_getassoc_stamacaddr(struct net_device *dev,
 	if (errno)
 		return errno;
 
-	cds_ssr_protect(__func__);
 	errno = __iw_softap_getassoc_stamacaddr(dev, info, wrqu, extra);
-	cds_ssr_unprotect(__func__);
 
 	osif_vdev_sync_op_stop(vdev_sync);
 
@@ -1997,9 +1973,7 @@ static iw_softap_disassoc_sta(struct net_device *dev,
 	if (errno)
 		return errno;
 
-	cds_ssr_protect(__func__);
 	errno = __iw_softap_disassoc_sta(dev, info, wrqu, extra);
-	cds_ssr_unprotect(__func__);
 
 	osif_vdev_sync_op_stop(vdev_sync);
 
@@ -2061,9 +2035,7 @@ static int iw_get_char_setnone(struct net_device *dev,
 	if (errno)
 		return errno;
 
-	cds_ssr_protect(__func__);
 	errno = __iw_get_char_setnone(dev, info, wrqu, extra);
-	cds_ssr_unprotect(__func__);
 
 	osif_vdev_sync_op_stop(vdev_sync);
 
@@ -2164,9 +2136,7 @@ int iw_get_channel_list(struct net_device *dev,
 	if (errno)
 		return errno;
 
-	cds_ssr_protect(__func__);
 	errno = __iw_get_channel_list(dev, info, wrqu, extra);
-	cds_ssr_unprotect(__func__);
 
 	osif_vdev_sync_op_stop(vdev_sync);
 
@@ -2233,9 +2203,7 @@ int iw_get_genie(struct net_device *dev,
 	if (errno)
 		return errno;
 
-	cds_ssr_protect(__func__);
 	errno = __iw_get_genie(dev, info, wrqu, extra);
-	cds_ssr_unprotect(__func__);
 
 	osif_vdev_sync_op_stop(vdev_sync);
 
@@ -2305,9 +2273,7 @@ static int iw_softap_stopbss(struct net_device *dev,
 	if (errno)
 		return errno;
 
-	cds_ssr_protect(__func__);
 	errno = __iw_softap_stopbss(dev, info, wrqu, extra);
-	cds_ssr_unprotect(__func__);
 
 	osif_vdev_sync_op_stop(vdev_sync);
 
@@ -2352,9 +2318,7 @@ static int iw_softap_version(struct net_device *dev,
 	if (errno)
 		return errno;
 
-	cds_ssr_protect(__func__);
 	errno = __iw_softap_version(dev, info, wrqu, extra);
-	cds_ssr_unprotect(__func__);
 
 	osif_vdev_sync_op_stop(vdev_sync);
 
@@ -2452,9 +2416,7 @@ static int iw_softap_get_sta_info(struct net_device *dev,
 	if (errno)
 		return errno;
 
-	cds_ssr_protect(__func__);
 	errno = __iw_softap_get_sta_info(dev, info, wrqu, extra);
-	cds_ssr_unprotect(__func__);
 
 	osif_vdev_sync_op_stop(vdev_sync);
 
@@ -2521,9 +2483,7 @@ static int iw_softap_get_ba_timeout(struct net_device *dev,
 	if (errno)
 		return errno;
 
-	cds_ssr_protect(__func__);
 	errno = __iw_softap_get_ba_timeout(dev, info, wrqu, extra);
-	cds_ssr_unprotect(__func__);
 
 	osif_vdev_sync_op_stop(vdev_sync);
 
@@ -2633,9 +2593,7 @@ iw_get_softap_linkspeed(struct net_device *dev,
 	if (errno)
 		return errno;
 
-	cds_ssr_protect(__func__);
 	errno = __iw_get_softap_linkspeed(dev, info, wrqu, extra);
-	cds_ssr_unprotect(__func__);
 
 	osif_vdev_sync_op_stop(vdev_sync);
 
@@ -2818,9 +2776,7 @@ iw_get_peer_rssi(struct net_device *dev, struct iw_request_info *info,
 	if (errno)
 		return errno;
 
-	cds_ssr_protect(__func__);
 	errno = __iw_get_peer_rssi(dev, info, wrqu, extra);
-	cds_ssr_unprotect(__func__);
 
 	osif_vdev_sync_op_stop(vdev_sync);
 

+ 0 - 2
core/hdd/src/wlan_hdd_ocb.c

@@ -599,9 +599,7 @@ int iw_set_dot11p_channel_sched(struct net_device *dev,
 	if (errno)
 		return errno;
 
-	cds_ssr_protect(__func__);
 	errno = __iw_set_dot11p_channel_sched(dev, info, wrqu, extra);
-	cds_ssr_unprotect(__func__);
 
 	osif_vdev_sync_op_stop(vdev_sync);
 

+ 0 - 42
core/hdd/src/wlan_hdd_wext.c

@@ -3751,9 +3751,7 @@ static int iw_get_linkspeed(struct net_device *dev,
 	if (errno)
 		return errno;
 
-	cds_ssr_protect(__func__);
 	errno = __iw_get_linkspeed(dev, info, wrqu, extra);
-	cds_ssr_unprotect(__func__);
 
 	osif_vdev_sync_op_stop(vdev_sync);
 
@@ -5779,9 +5777,7 @@ static int iw_setint_getnone(struct net_device *dev,
 	if (errno)
 		return errno;
 
-	cds_ssr_protect(__func__);
 	errno = __iw_setint_getnone(dev, info, wrqu, extra);
-	cds_ssr_unprotect(__func__);
 
 	osif_vdev_sync_op_stop(vdev_sync);
 
@@ -5849,9 +5845,7 @@ static int iw_setnone_get_threeint(struct net_device *dev,
 	if (errno)
 		return errno;
 
-	cds_ssr_protect(__func__);
 	errno = __iw_setnone_get_threeint(dev, info, wrqu, extra);
-	cds_ssr_unprotect(__func__);
 
 	osif_vdev_sync_op_stop(vdev_sync);
 
@@ -6093,9 +6087,7 @@ static int iw_setchar_getnone(struct net_device *dev,
 	if (errno)
 		return errno;
 
-	cds_ssr_protect(__func__);
 	errno = __iw_setchar_getnone(dev, info, wrqu, extra);
-	cds_ssr_unprotect(__func__);
 
 	osif_vdev_sync_op_stop(vdev_sync);
 
@@ -6604,9 +6596,7 @@ static int iw_setnone_getint(struct net_device *dev,
 	if (errno)
 		return errno;
 
-	cds_ssr_protect(__func__);
 	errno = __iw_setnone_getint(dev, info, wrqu, extra);
-	cds_ssr_unprotect(__func__);
 
 	osif_vdev_sync_op_stop(vdev_sync);
 
@@ -6744,9 +6734,7 @@ int iw_set_three_ints_getnone(struct net_device *dev,
 	if (errno)
 		return errno;
 
-	cds_ssr_protect(__func__);
 	errno = __iw_set_three_ints_getnone(dev, info, wrqu, extra);
-	cds_ssr_unprotect(__func__);
 
 	osif_vdev_sync_op_stop(vdev_sync);
 
@@ -7431,9 +7419,7 @@ static int iw_get_char_setnone(struct net_device *dev,
 	if (errno)
 		return errno;
 
-	cds_ssr_protect(__func__);
 	errno = __iw_get_char_setnone(dev, info, wrqu, extra);
-	cds_ssr_unprotect(__func__);
 
 	osif_vdev_sync_op_stop(vdev_sync);
 
@@ -7558,9 +7544,7 @@ static int iw_setnone_getnone(struct net_device *dev,
 	if (errno)
 		return errno;
 
-	cds_ssr_protect(__func__);
 	errno = __iw_setnone_getnone(dev, info, wrqu, extra);
-	cds_ssr_unprotect(__func__);
 
 	osif_vdev_sync_op_stop(vdev_sync);
 
@@ -8265,10 +8249,8 @@ static int iw_hdd_set_var_ints_getnone(struct net_device *dev,
 	if (errno)
 		return errno;
 
-	cds_ssr_protect(__func__);
 	errno = __iw_set_var_ints_getnone(dev, info, &u_priv_wrqu,
 					  (char *)&apps_args);
-	cds_ssr_unprotect(__func__);
 
 	osif_vdev_sync_op_stop(vdev_sync);
 
@@ -8299,9 +8281,7 @@ int iw_set_var_ints_getnone(struct net_device *dev,
 	if (errno)
 		return errno;
 
-	cds_ssr_protect(__func__);
 	errno = __iw_set_var_ints_getnone(dev, info, wrqu, extra);
-	cds_ssr_unprotect(__func__);
 
 	osif_vdev_sync_op_stop(vdev_sync);
 
@@ -8483,9 +8463,7 @@ static int iw_add_tspec(struct net_device *dev,
 	if (errno)
 		return errno;
 
-	cds_ssr_protect(__func__);
 	errno = __iw_add_tspec(dev, info, wrqu, extra);
-	cds_ssr_unprotect(__func__);
 
 	osif_vdev_sync_op_stop(vdev_sync);
 
@@ -8557,9 +8535,7 @@ static int iw_del_tspec(struct net_device *dev,
 	if (errno)
 		return errno;
 
-	cds_ssr_protect(__func__);
 	errno = __iw_del_tspec(dev, info, wrqu, extra);
-	cds_ssr_unprotect(__func__);
 
 	osif_vdev_sync_op_stop(vdev_sync);
 
@@ -8624,9 +8600,7 @@ static int iw_get_tspec(struct net_device *dev,
 	if (errno)
 		return errno;
 
-	cds_ssr_protect(__func__);
 	errno = __iw_get_tspec(dev, info, wrqu, extra);
-	cds_ssr_unprotect(__func__);
 
 	osif_vdev_sync_op_stop(vdev_sync);
 
@@ -8699,9 +8673,7 @@ static int iw_set_fties(struct net_device *dev,
 	if (errno)
 		return errno;
 
-	cds_ssr_protect(__func__);
 	errno = __iw_set_fties(dev, info, wrqu, extra);
-	cds_ssr_unprotect(__func__);
 
 	osif_vdev_sync_op_stop(vdev_sync);
 
@@ -8848,9 +8820,7 @@ static int iw_set_host_offload(struct net_device *dev,
 	if (errno)
 		return errno;
 
-	cds_ssr_protect(__func__);
 	errno = __iw_set_host_offload(dev, info, wrqu, extra);
-	cds_ssr_unprotect(__func__);
 
 	osif_vdev_sync_op_stop(vdev_sync);
 
@@ -8947,9 +8917,7 @@ static int iw_set_keepalive_params(struct net_device *dev,
 	if (errno)
 		return errno;
 
-	cds_ssr_protect(__func__);
 	errno = __iw_set_keepalive_params(dev, info, wrqu, extra);
-	cds_ssr_unprotect(__func__);
 
 	osif_vdev_sync_op_stop(vdev_sync);
 
@@ -9095,9 +9063,7 @@ static int iw_set_packet_filter_params(struct net_device *dev,
 	if (errno)
 		return errno;
 
-	cds_ssr_protect(__func__);
 	errno = __iw_set_packet_filter_params(dev, info, wrqu, extra);
-	cds_ssr_unprotect(__func__);
 
 	osif_vdev_sync_op_stop(vdev_sync);
 
@@ -9350,9 +9316,7 @@ static int iw_get_statistics(struct net_device *dev,
 	if (errno)
 		return errno;
 
-	cds_ssr_protect(__func__);
 	errno = __iw_get_statistics(dev, info, wrqu, extra);
-	cds_ssr_unprotect(__func__);
 
 	osif_vdev_sync_op_stop(vdev_sync);
 
@@ -9704,9 +9668,7 @@ static int iw_set_pno(struct net_device *dev,
 	if (errno)
 		return errno;
 
-	cds_ssr_protect(__func__);
 	errno = __iw_set_pno(dev, info, wrqu, extra);
-	cds_ssr_unprotect(__func__);
 
 	osif_vdev_sync_op_stop(vdev_sync);
 
@@ -9749,9 +9711,7 @@ static int iw_set_band_config(struct net_device *dev,
 	if (errno)
 		return errno;
 
-	cds_ssr_protect(__func__);
 	errno = __iw_set_band_config(dev, info, wrqu, extra);
-	cds_ssr_unprotect(__func__);
 
 	osif_vdev_sync_op_stop(vdev_sync);
 
@@ -9972,9 +9932,7 @@ static int iw_set_two_ints_getnone(struct net_device *dev,
 	if (errno)
 		return errno;
 
-	cds_ssr_protect(__func__);
 	errno = __iw_set_two_ints_getnone(dev, info, wrqu, extra);
-	cds_ssr_unprotect(__func__);
 
 	osif_vdev_sync_op_stop(vdev_sync);