Commit dcb18f51 authored by Phillip Potter's avatar Phillip Potter Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: change return type of rtw_set_802_11_disassociate to void 



Change return type of rtw_set_802_11_disassociate to void. This function
always returns 'true' no matter what, so there is no need to return a
value, and no need to check for it in the two call sites within
rtw_wx_set_mlme. Also, as we are no longer using ret in rtw_wx_set_mlme
except as the return value, just remove it and return 0 directly.

Suggested-by: default avatarMichael Straube <straube.linux@gmail.com>
Signed-off-by: default avatarPhillip Potter <phil@philpotter.co.uk>
Tested-by: Philipp Hortmann <philipp.g.hortmann@gmail.com> # Edimax N150
Link: https://lore.kernel.org/r/20221103230632.6946-1-phil@philpotter.co.uk


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1d629063

drivers/staging/r8188eu/core/rtw_ioctl_set.c

+1 −3
Original line number Diff line number Diff line
@@ -314,7 +314,7 @@ u8 rtw_set_802_11_infrastructure_mode(struct adapter *padapter, 
	return true;

}



u8 rtw_set_802_11_disassociate(struct adapter *padapter)

void rtw_set_802_11_disassociate(struct adapter *padapter)

{

	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@@ -328,8 +328,6 @@ u8 rtw_set_802_11_disassociate(struct adapter *padapter) 
	}



	spin_unlock_bh(&pmlmepriv->lock);



	return true;

}



u8 rtw_set_802_11_bssid_list_scan(struct adapter *padapter, struct ndis_802_11_ssid *pssid, int ssid_max_num)

drivers/staging/r8188eu/include/rtw_ioctl_set.h

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ u8 rtw_set_802_11_authentication_mode(struct adapter *adapt, 
				      enum ndis_802_11_auth_mode authmode);

u8 rtw_set_802_11_bssid(struct adapter *adapter, u8 *bssid);

u8 rtw_set_802_11_add_wep(struct adapter *adapter, struct ndis_802_11_wep *wep);

u8 rtw_set_802_11_disassociate(struct adapter *adapter);

void rtw_set_802_11_disassociate(struct adapter *adapter);

u8 rtw_set_802_11_bssid_list_scan(struct adapter *adapter,

				  struct ndis_802_11_ssid *pssid,

				  int ssid_max_num);

drivers/staging/r8188eu/os_dep/ioctl_linux.c

+3 −6
Original line number Diff line number Diff line
@@ -1011,7 +1011,6 @@ static int rtw_wx_set_mlme(struct net_device *dev, 
			     struct iw_request_info *info,

			     union iwreq_data *wrqu, char *extra)

{

	int ret = 0;

	struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);

	struct iw_mlme *mlme = (struct iw_mlme *)extra;
@@ -1020,17 +1019,15 @@ static int rtw_wx_set_mlme(struct net_device *dev, 


	switch (mlme->cmd) {

	case IW_MLME_DEAUTH:

		if (!rtw_set_802_11_disassociate(padapter))

			ret = -1;

		rtw_set_802_11_disassociate(padapter);

		break;

	case IW_MLME_DISASSOC:

		if (!rtw_set_802_11_disassociate(padapter))

			ret = -1;

		rtw_set_802_11_disassociate(padapter);

		break;

	default:

		return -EOPNOTSUPP;

	}

	return ret;

	return 0;

}



static int rtw_wx_set_scan(struct net_device *dev, struct iw_request_info *a,