staging: r8188eu: Remove wrapper around spin_unlock_bh (e02bcf61) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/staging/rtl8188eu/core/rtw_ap.c

+19 −19

Original line number	Diff line number	Diff line
		@@ -64,7 +64,7 @@ void free_mlme_ap_info(struct adapter *padapter)
		psta = rtw_get_bcmc_stainfo(padapter);
		spin_lock_bh(&(pstapriv->sta_hash_lock));
		rtw_free_stainfo(padapter, psta);
		_exit_critical_bh(&(pstapriv->sta_hash_lock), &irqL);
		spin_unlock_bh(&(pstapriv->sta_hash_lock));

		_rtw_spinlock_free(&pmlmepriv->bcn_update_lock);
		}
		@@ -305,18 +305,18 @@ void expire_timeout_chk(struct adapter *padapter)
		DBG_88E("auth expire %6ph\n",
		psta->hwaddr);

		_exit_critical_bh(&pstapriv->auth_list_lock, &irqL);
		spin_unlock_bh(&pstapriv->auth_list_lock);

		spin_lock_bh(&(pstapriv->sta_hash_lock));
		rtw_free_stainfo(padapter, psta);
		_exit_critical_bh(&(pstapriv->sta_hash_lock), &irqL);
		spin_unlock_bh(&(pstapriv->sta_hash_lock));

		spin_lock_bh(&pstapriv->auth_list_lock);
		}
		}

		}
		_exit_critical_bh(&pstapriv->auth_list_lock, &irqL);
		spin_unlock_bh(&pstapriv->auth_list_lock);

		psta = NULL;

		@@ -387,7 +387,7 @@ void expire_timeout_chk(struct adapter *padapter)
		}
		}

		_exit_critical_bh(&pstapriv->asoc_list_lock, &irqL);
		spin_unlock_bh(&pstapriv->asoc_list_lock);

		if (chk_alive_num) {
		u8 backup_oper_channel = 0;
		@@ -428,7 +428,7 @@ void expire_timeout_chk(struct adapter *padapter)
		rtw_list_delete(&psta->asoc_list);
		pstapriv->asoc_list_cnt--;
		updated = ap_free_sta(padapter, psta, true, WLAN_REASON_DEAUTH_LEAVING);
		_exit_critical_bh(&pstapriv->asoc_list_lock, &irqL);
		spin_unlock_bh(&pstapriv->asoc_list_lock);
		}

		if (backup_oper_channel > 0) /* back to the original operation channel */
		@@ -606,7 +606,7 @@ static void update_bmc_sta(struct adapter *padapter)

		spin_lock_bh(&psta->lock);
		psta->state = _FW_LINKED;
		_exit_critical_bh(&psta->lock, &irqL);
		spin_unlock_bh(&psta->lock);

		} else {
		DBG_88E("add_RATid_bmc_sta error!\n");
		@@ -681,7 +681,7 @@ void update_sta_info_apmode(struct adapter padapter, struct sta_info psta)

		spin_lock_bh(&psta->lock);
		psta->state \|= _FW_LINKED;
		_exit_critical_bh(&psta->lock, &irqL);
		spin_unlock_bh(&psta->lock);
		}

		static void update_hw_ht_param(struct adapter *padapter)
		@@ -1166,7 +1166,7 @@ int rtw_acl_add_sta(struct adapter padapter, u8 addr)
		}
		}

		_exit_critical_bh(&(pacl_node_q->lock), &irqL);
		spin_unlock_bh(&(pacl_node_q->lock));

		if (added)
		return ret;
		@@ -1193,7 +1193,7 @@ int rtw_acl_add_sta(struct adapter padapter, u8 addr)

		DBG_88E("%s, acl_num =%d\n", __func__, pacl_list->num);

		_exit_critical_bh(&(pacl_node_q->lock), &irqL);
		spin_unlock_bh(&(pacl_node_q->lock));

		return ret;
		}
		@@ -1230,7 +1230,7 @@ int rtw_acl_remove_sta(struct adapter padapter, u8 addr)
		}
		}

		_exit_critical_bh(&(pacl_node_q->lock), &irqL);
		spin_unlock_bh(&(pacl_node_q->lock));

		DBG_88E("%s, acl_num =%d\n", __func__, pacl_list->num);
		return ret;
		@@ -1416,7 +1416,7 @@ void update_beacon(struct adapter padapter, u8 ie_id, u8 oui, u8 tx)

		pmlmepriv->update_bcn = true;

		_exit_critical_bh(&pmlmepriv->bcn_update_lock, &irqL);
		spin_unlock_bh(&pmlmepriv->bcn_update_lock);

		if (tx)
		set_tx_beacon_cmd(padapter);
		@@ -1523,7 +1523,7 @@ void associated_clients_update(struct adapter *padapter, u8 updated)

		VCS_update(padapter, psta);
		}
		_exit_critical_bh(&pstapriv->asoc_list_lock, &irqL);
		spin_unlock_bh(&pstapriv->asoc_list_lock);
		}
		}

		@@ -1755,7 +1755,7 @@ u8 ap_free_sta(struct adapter padapter, struct sta_info psta,

		spin_lock_bh(&psta->lock);
		psta->state &= ~_FW_LINKED;
		_exit_critical_bh(&psta->lock, &irqL);
		spin_unlock_bh(&psta->lock);

		rtw_indicate_sta_disassoc_event(padapter, psta);

		@@ -1765,7 +1765,7 @@ u8 ap_free_sta(struct adapter padapter, struct sta_info psta,

		spin_lock_bh(&(pstapriv->sta_hash_lock));
		rtw_free_stainfo(padapter, psta);
		_exit_critical_bh(&(pstapriv->sta_hash_lock), &irqL);
		spin_unlock_bh(&(pstapriv->sta_hash_lock));

		return beacon_updated;
		}
		@@ -1799,7 +1799,7 @@ int rtw_ap_inform_ch_switch(struct adapter *padapter, u8 new_ch, u8 ch_offset)
		issue_action_spct_ch_switch(padapter, psta->hwaddr, new_ch, ch_offset);
		psta->expire_to = ((pstapriv->expire_to * 2) > 5) ? 5 : (pstapriv->expire_to * 2);
		}
		_exit_critical_bh(&pstapriv->asoc_list_lock, &irqL);
		spin_unlock_bh(&pstapriv->asoc_list_lock);

		issue_action_spct_ch_switch(padapter, bc_addr, new_ch, ch_offset);

		@@ -1837,7 +1837,7 @@ int rtw_sta_flush(struct adapter *padapter)

		ap_free_sta(padapter, psta, true, WLAN_REASON_DEAUTH_LEAVING);
		}
		_exit_critical_bh(&pstapriv->asoc_list_lock, &irqL);
		spin_unlock_bh(&pstapriv->asoc_list_lock);


		issue_deauth(padapter, bc_addr, WLAN_REASON_DEAUTH_LEAVING);
		@@ -1969,7 +1969,7 @@ void stop_ap_mode(struct adapter *padapter)
		pacl_list->num--;
		}
		}
		_exit_critical_bh(&(pacl_node_q->lock), &irqL);
		spin_unlock_bh(&(pacl_node_q->lock));

		DBG_88E("%s, free acl_node_queue, num =%d\n", __func__, pacl_list->num);

		@@ -1981,7 +1981,7 @@ void stop_ap_mode(struct adapter *padapter)
		psta = rtw_get_bcmc_stainfo(padapter);
		spin_lock_bh(&(pstapriv->sta_hash_lock));
		rtw_free_stainfo(padapter, psta);
		_exit_critical_bh(&(pstapriv->sta_hash_lock), &irqL);
		spin_unlock_bh(&(pstapriv->sta_hash_lock));

		rtw_init_bcmc_stainfo(padapter);

drivers/staging/rtl8188eu/core/rtw_br_ext.c

+10 −18

Original line number	Diff line number	Diff line
		@@ -353,7 +353,6 @@ static int __nat25_db_network_lookup_and_replace(struct adapter *priv,
		struct sk_buff skb, unsigned char networkAddr)
		{
		struct nat25_network_db_entry *db;
		unsigned long irqL;
		spin_lock_bh(&priv->br_ext_lock);

		db = priv->nethash[__nat25_network_hash(networkAddr)];
		@@ -390,12 +389,12 @@ static int __nat25_db_network_lookup_and_replace(struct adapter *priv,
		db->networkAddr[15],
		db->networkAddr[16]);
		}
		_exit_critical_bh(&priv->br_ext_lock, &irqL);
		spin_unlock_bh(&priv->br_ext_lock);
		return 1;
		}
		db = db->next_hash;
		}
		_exit_critical_bh(&priv->br_ext_lock, &irqL);
		spin_unlock_bh(&priv->br_ext_lock);
		return 0;
		}

		@@ -404,7 +403,6 @@ static void __nat25_db_network_insert(struct adapter *priv,
		{
		struct nat25_network_db_entry *db;
		int hash;
		unsigned long irqL;

		spin_lock_bh(&priv->br_ext_lock);
		hash = __nat25_network_hash(networkAddr);
		@@ -413,14 +411,14 @@ static void __nat25_db_network_insert(struct adapter *priv,
		if (!memcmp(db->networkAddr, networkAddr, MAX_NETWORK_ADDR_LEN)) {
		memcpy(db->macAddr, macAddr, ETH_ALEN);
		db->ageing_timer = jiffies;
		_exit_critical_bh(&priv->br_ext_lock, &irqL);
		spin_unlock_bh(&priv->br_ext_lock);
		return;
		}
		db = db->next_hash;
		}
		db = (struct nat25_network_db_entry ) rtw_malloc(sizeof(db));
		if (db == NULL) {
		_exit_critical_bh(&priv->br_ext_lock, &irqL);
		spin_unlock_bh(&priv->br_ext_lock);
		return;
		}
		memcpy(db->networkAddr, networkAddr, MAX_NETWORK_ADDR_LEN);
		@@ -430,7 +428,7 @@ static void __nat25_db_network_insert(struct adapter *priv,

		__network_hash_link(priv, db, hash);

		_exit_critical_bh(&priv->br_ext_lock, &irqL);
		spin_unlock_bh(&priv->br_ext_lock);
		}

		static void __nat25_db_print(struct adapter *priv)
		@@ -444,7 +442,6 @@ static void __nat25_db_print(struct adapter *priv)
		void nat25_db_cleanup(struct adapter *priv)
		{
		int i;
		unsigned long irqL;
		spin_lock_bh(&priv->br_ext_lock);

		for (i = 0; i < NAT25_HASH_SIZE; i++) {
		@@ -464,13 +461,12 @@ void nat25_db_cleanup(struct adapter *priv)
		f = g;
		}
		}
		_exit_critical_bh(&priv->br_ext_lock, &irqL);
		spin_unlock_bh(&priv->br_ext_lock);
		}

		void nat25_db_expire(struct adapter *priv)
		{
		int i;
		unsigned long irqL;
		spin_lock_bh(&priv->br_ext_lock);

		for (i = 0; i < NAT25_HASH_SIZE; i++) {
		@@ -495,7 +491,7 @@ void nat25_db_expire(struct adapter *priv)
		f = g;
		}
		}
		_exit_critical_bh(&priv->br_ext_lock, &irqL);
		spin_unlock_bh(&priv->br_ext_lock);
		}

		int nat25_db_handle(struct adapter priv, struct sk_buff skb, int method)
		@@ -1060,7 +1056,6 @@ int nat25_handle_frame(struct adapter priv, struct sk_buff skb)
		}

		if (!priv->ethBrExtInfo.nat25_disable) {
		unsigned long irqL;
		spin_lock_bh(&priv->br_ext_lock);
		/*
		* This function look up the destination network address from
		@@ -1072,9 +1067,9 @@ int nat25_handle_frame(struct adapter priv, struct sk_buff skb)
		!memcmp(priv->scdb_ip, skb->data+ETH_HLEN+16, 4)) {
		memcpy(skb->data, priv->scdb_mac, ETH_ALEN);

		_exit_critical_bh(&priv->br_ext_lock, &irqL);
		spin_unlock_bh(&priv->br_ext_lock);
		} else {
		_exit_critical_bh(&priv->br_ext_lock, &irqL);
		spin_unlock_bh(&priv->br_ext_lock);

		retval = nat25_db_handle(priv, skb, NAT25_LOOKUP);
		}
		@@ -1183,14 +1178,11 @@ void scdb_findEntry(struct adapter priv, unsigned char *macAddr,
		hash = __nat25_network_hash(networkAddr);
		db = priv->nethash[hash];
		while (db != NULL) {
		if (!memcmp(db->networkAddr, networkAddr, MAX_NETWORK_ADDR_LEN)) {
		/* _exit_critical_bh(&priv->br_ext_lock, &irqL); */
		if (!memcmp(db->networkAddr, networkAddr, MAX_NETWORK_ADDR_LEN))
		return (void *)db;
		}

		db = db->next_hash;
		}

		/* _exit_critical_bh(&priv->br_ext_lock, &irqL); */
		return NULL;
		}

drivers/staging/rtl8188eu/core/rtw_cmd.c

+5 −10

Original line number	Diff line number	Diff line
		@@ -2196,7 +2196,6 @@ _func_exit_;
		}
		void rtw_disassoc_cmd_callback(struct adapter padapter, struct cmd_obj pcmd)
		{
		unsigned long irqL;
		struct mlme_priv *pmlmepriv = &padapter->mlmepriv;

		_func_enter_;
		@@ -2204,7 +2203,7 @@ _func_enter_;
		if (pcmd->res != H2C_SUCCESS) {
		spin_lock_bh(&pmlmepriv->lock);
		set_fwstate(pmlmepriv, _FW_LINKED);
		_exit_critical_bh(&pmlmepriv->lock, &irqL);
		spin_unlock_bh(&pmlmepriv->lock);

		RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, ("\n *Error: disconnect_cmd_callback Fail *\n."));

		@@ -2242,7 +2241,6 @@ _func_exit_;

		void rtw_createbss_cmd_callback(struct adapter padapter, struct cmd_obj pcmd)
		{
		unsigned long irqL;
		u8 timer_cancelled;
		struct sta_info *psta = NULL;
		struct wlan_network *pwlan = NULL;
		@@ -2273,15 +2271,13 @@ _func_enter_;

		rtw_indicate_connect(padapter);
		} else {
		unsigned long irqL;

		pwlan = _rtw_alloc_network(pmlmepriv);
		spin_lock_bh(&(pmlmepriv->scanned_queue.lock));
		if (pwlan == NULL) {
		pwlan = rtw_get_oldest_wlan_network(&pmlmepriv->scanned_queue);
		if (pwlan == NULL) {
		RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, ("\n Error: can't get pwlan in rtw_joinbss_event_callback\n"));
		_exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL);
		spin_unlock_bh(&pmlmepriv->scanned_queue.lock);
		goto createbss_cmd_fail;
		}
		pwlan->last_scanned = rtw_get_current_time();
		@@ -2296,13 +2292,13 @@ _func_enter_;

		_clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING);

		_exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL);
		spin_unlock_bh(&pmlmepriv->scanned_queue.lock);
		/* we will set _FW_LINKED when there is one more sat to join us (rtw_stassoc_event_callback) */
		}

		createbss_cmd_fail:

		_exit_critical_bh(&pmlmepriv->lock, &irqL);
		spin_unlock_bh(&pmlmepriv->lock);

		rtw_free_cmd_obj(pcmd);

		@@ -2328,7 +2324,6 @@ _func_exit_;

		void rtw_setassocsta_cmdrsp_callback(struct adapter padapter, struct cmd_obj pcmd)
		{
		unsigned long irqL;
		struct sta_priv *pstapriv = &padapter->stapriv;
		struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
		struct set_assocsta_parm passocsta_parm = (struct set_assocsta_parm )(pcmd->parmbuf);
		@@ -2351,7 +2346,7 @@ _func_enter_;
		_clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING);

		set_fwstate(pmlmepriv, _FW_LINKED);
		_exit_critical_bh(&pmlmepriv->lock, &irqL);
		spin_unlock_bh(&pmlmepriv->lock);

		exit:
		rtw_free_cmd_obj(pcmd);

drivers/staging/rtl8188eu/core/rtw_debug.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -882,7 +882,7 @@ int proc_get_all_sta_info(char page, char *start,
		}
		}
		}
		_exit_critical_bh(&pstapriv->sta_hash_lock, &irqL);
		spin_unlock_bh(&pstapriv->sta_hash_lock);

		*eof = 1;
		return len;

drivers/staging/rtl8188eu/core/rtw_ioctl_set.c

+7 −13

Original line number	Diff line number	Diff line
		@@ -68,7 +68,6 @@ _func_exit_;

		u8 rtw_do_join(struct adapter *padapter)
		{
		unsigned long irqL;
		struct list_head plist, phead;
		u8 *pibss = NULL;
		struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
		@@ -92,7 +91,7 @@ _func_enter_;
		pmlmepriv->to_join = true;

		if (_rtw_queue_empty(queue)) {
		_exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL);
		spin_unlock_bh(&(pmlmepriv->scanned_queue.lock));
		_clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING);

		/* when set_ssid/set_bssid for rtw_do_join(), but scanning queue is empty */
		@@ -116,7 +115,7 @@ _func_enter_;
		} else {
		int select_ret;

		_exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL);
		spin_unlock_bh(&(pmlmepriv->scanned_queue.lock));
		select_ret = rtw_select_and_join_from_scanned_queue(pmlmepriv);
		if (select_ret == _SUCCESS) {
		pmlmepriv->to_join = false;
		@@ -178,7 +177,6 @@ _func_exit_;

		u8 rtw_set_802_11_bssid(struct adapter padapter, u8 bssid)
		{
		unsigned long irqL;
		u8 status = _SUCCESS;
		u32 cur_time = 0;
		struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
		@@ -253,7 +251,7 @@ _func_enter_;
		status = rtw_do_join(padapter);

		release_mlme_lock:
		_exit_critical_bh(&pmlmepriv->lock, &irqL);
		spin_unlock_bh(&pmlmepriv->lock);

		exit:
		RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_,
		@@ -266,7 +264,6 @@ _func_exit_;

		u8 rtw_set_802_11_ssid(struct adapter padapter, struct ndis_802_11_ssid ssid)
		{
		unsigned long irqL;
		u8 status = _SUCCESS;
		u32 cur_time = 0;

		@@ -367,7 +364,7 @@ _func_enter_;
		}

		release_mlme_lock:
		_exit_critical_bh(&pmlmepriv->lock, &irqL);
		spin_unlock_bh(&pmlmepriv->lock);

		exit:
		RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_,
		@@ -379,7 +376,6 @@ _func_exit_;
		u8 rtw_set_802_11_infrastructure_mode(struct adapter *padapter,
		enum ndis_802_11_network_infra networktype)
		{
		unsigned long irqL;
		struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
		struct wlan_network *cur_network = &pmlmepriv->cur_network;
		enum ndis_802_11_network_infra *pold_state = &(cur_network->network.InfrastructureMode);
		@@ -439,7 +435,7 @@ _func_enter_;
		case Ndis802_11InfrastructureMax:
		break;
		}
		_exit_critical_bh(&pmlmepriv->lock, &irqL);
		spin_unlock_bh(&pmlmepriv->lock);
		}

		_func_exit_;
		@@ -450,7 +446,6 @@ _func_exit_;

		u8 rtw_set_802_11_disassociate(struct adapter *padapter)
		{
		unsigned long irqL;
		struct mlme_priv *pmlmepriv = &padapter->mlmepriv;

		_func_enter_;
		@@ -467,7 +462,7 @@ _func_enter_;
		rtw_pwr_wakeup(padapter);
		}

		_exit_critical_bh(&pmlmepriv->lock, &irqL);
		spin_unlock_bh(&pmlmepriv->lock);

		_func_exit_;

		@@ -476,7 +471,6 @@ _func_exit_;

		u8 rtw_set_802_11_bssid_list_scan(struct adapter padapter, struct ndis_802_11_ssid pssid, int ssid_max_num)
		{
		unsigned long irqL;
		struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
		u8 res = true;

		@@ -516,7 +510,7 @@ _func_enter_;

		res = rtw_sitesurvey_cmd(padapter, pssid, ssid_max_num, NULL, 0);

		_exit_critical_bh(&pmlmepriv->lock, &irqL);
		spin_unlock_bh(&pmlmepriv->lock);
		}
		exit: