Commit 76cdbbc5 authored by Michael Straube's avatar Michael Straube Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: remove unnecessary parentheses in os_dep dir 



Remove unnecessary parentheses in the os_dep directory reported by
checkpatch.

Signed-off-by: default avatarMichael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20210809165007.23204-2-straube.linux@gmail.com


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

drivers/staging/r8188eu/os_dep/ioctl_linux.c

+81 −81
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ static char *translate_scan(struct adapter *padapter, 
			    struct wlan_network *pnetwork,

			    char *start, char *stop)

{

	struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);

	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;

	struct iw_event iwe;

	u16 cap;

	__le16 le_tmp;
@@ -544,7 +544,7 @@ static int wpa_set_encryption(struct net_device *dev, struct ieee_param *param, 
				ret = -EOPNOTSUPP;

				goto exit;

			}

		      memcpy(&(psecuritypriv->dot11DefKey[wep_key_idx].skey[0]), pwep->KeyMaterial, pwep->KeyLength);

		      memcpy(&psecuritypriv->dot11DefKey[wep_key_idx].skey[0], pwep->KeyMaterial, pwep->KeyLength);

			psecuritypriv->dot11DefKeylen[wep_key_idx] = pwep->KeyLength;

			rtw_set_key(padapter, psecuritypriv, wep_key_idx, 0);

		}
@@ -571,8 +571,8 @@ static int wpa_set_encryption(struct net_device *dev, struct ieee_param *param, 
					memcpy(psta->dot118021x_UncstKey.skey,  param->u.crypt.key, (param->u.crypt.key_len > 16 ? 16 : param->u.crypt.key_len));



					if (strcmp(param->u.crypt.alg, "TKIP") == 0) { /* set mic key */

						memcpy(psta->dot11tkiptxmickey.skey, &(param->u.crypt.key[16]), 8);

						memcpy(psta->dot11tkiprxmickey.skey, &(param->u.crypt.key[24]), 8);

						memcpy(psta->dot11tkiptxmickey.skey, &param->u.crypt.key[16], 8);

						memcpy(psta->dot11tkiprxmickey.skey, &param->u.crypt.key[24], 8);

						padapter->securitypriv.busetkipkey = false;

					}
@@ -581,8 +581,8 @@ static int wpa_set_encryption(struct net_device *dev, struct ieee_param *param, 
					rtw_setstakey_cmd(padapter, (unsigned char *)psta, true);

				} else { /* group key */

					memcpy(padapter->securitypriv.dot118021XGrpKey[param->u.crypt.idx].skey,  param->u.crypt.key, (param->u.crypt.key_len > 16 ? 16 : param->u.crypt.key_len));

					memcpy(padapter->securitypriv.dot118021XGrptxmickey[param->u.crypt.idx].skey, &(param->u.crypt.key[16]), 8);

					memcpy(padapter->securitypriv.dot118021XGrprxmickey[param->u.crypt.idx].skey, &(param->u.crypt.key[24]), 8);

					memcpy(padapter->securitypriv.dot118021XGrptxmickey[param->u.crypt.idx].skey, &param->u.crypt.key[16], 8);

					memcpy(padapter->securitypriv.dot118021XGrprxmickey[param->u.crypt.idx].skey, &param->u.crypt.key[24], 8);

					padapter->securitypriv.binstallGrpkey = true;

					DBG_88E(" ~~~~set sta key:groupkey\n");
@@ -757,7 +757,7 @@ static int rtw_wx_get_name(struct net_device *dev, 
	u32 ht_ielen = 0;

	char *p;

	u8 ht_cap = false;

	struct	mlme_priv	*pmlmepriv = &(padapter->mlmepriv);

	struct	mlme_priv	*pmlmepriv = &padapter->mlmepriv;

	struct wlan_bssid_ex  *pcur_bss = &pmlmepriv->cur_network.network;

	NDIS_802_11_RATES_EX *prates = NULL;
@@ -806,7 +806,7 @@ static int rtw_wx_get_freq(struct net_device *dev, 
			     union iwreq_data *wrqu, char *extra)

{

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

	struct	mlme_priv	*pmlmepriv = &(padapter->mlmepriv);

	struct	mlme_priv	*pmlmepriv = &padapter->mlmepriv;

	struct wlan_bssid_ex  *pcur_bss = &pmlmepriv->cur_network.network;



	if (check_fwstate(pmlmepriv, _FW_LINKED)) {
@@ -877,7 +877,7 @@ static int rtw_wx_get_mode(struct net_device *dev, struct iw_request_info *a, 
			     union iwreq_data *wrqu, char *b)

{

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

	struct	mlme_priv	*pmlmepriv = &(padapter->mlmepriv);

	struct	mlme_priv	*pmlmepriv = &padapter->mlmepriv;



	if (check_fwstate(pmlmepriv, WIFI_STATION_STATE))

		wrqu->mode = IW_MODE_INFRA;
@@ -1078,10 +1078,10 @@ static int rtw_wx_set_wap(struct net_device *dev, 
	uint ret = 0;

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

	struct sockaddr *temp = (struct sockaddr *)awrq;

	struct	mlme_priv	*pmlmepriv = &(padapter->mlmepriv);

	struct	mlme_priv	*pmlmepriv = &padapter->mlmepriv;

	struct list_head *phead;

	u8 *dst_bssid, *src_bssid;

	struct __queue *queue	= &(pmlmepriv->scanned_queue);

	struct __queue *queue	= &pmlmepriv->scanned_queue;

	struct	wlan_network	*pnetwork = NULL;

	enum ndis_802_11_auth_mode	authmode;
@@ -1148,7 +1148,7 @@ static int rtw_wx_get_wap(struct net_device *dev, 
			    union iwreq_data *wrqu, char *extra)

{

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

	struct	mlme_priv	*pmlmepriv = &(padapter->mlmepriv);

	struct	mlme_priv	*pmlmepriv = &padapter->mlmepriv;

	struct wlan_bssid_ex  *pcur_bss = &pmlmepriv->cur_network.network;



	wrqu->ap_addr.sa_family = ARPHRD_ETHER;
@@ -1209,7 +1209,7 @@ static int rtw_wx_set_scan(struct net_device *dev, struct iw_request_info *a, 
	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;

	struct ndis_802_11_ssid ssid[RTW_SSID_SCAN_AMOUNT];

#ifdef CONFIG_88EU_P2P

	struct wifidirect_info *pwdinfo = &(padapter->wdinfo);

	struct wifidirect_info *pwdinfo = &padapter->wdinfo;

#endif /* CONFIG_88EU_P2P */



	if (padapter->registrypriv.mp_mode == 1) {
@@ -1350,8 +1350,8 @@ static int rtw_wx_get_scan(struct net_device *dev, struct iw_request_info *a, 
{

	struct list_head *plist, *phead;

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

	struct	mlme_priv	*pmlmepriv = &(padapter->mlmepriv);

	struct __queue *queue	= &(pmlmepriv->scanned_queue);

	struct	mlme_priv	*pmlmepriv = &padapter->mlmepriv;

	struct __queue *queue	= &pmlmepriv->scanned_queue;

	struct	wlan_network	*pnetwork = NULL;

	char *ev = extra;

	char *stop = ev + wrqu->data.length;
@@ -1525,7 +1525,7 @@ static int rtw_wx_get_essid(struct net_device *dev, 
{

	u32 len, ret = 0;

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

	struct	mlme_priv	*pmlmepriv = &(padapter->mlmepriv);

	struct	mlme_priv	*pmlmepriv = &padapter->mlmepriv;

	struct wlan_bssid_ex  *pcur_bss = &pmlmepriv->cur_network.network;



	if ((check_fwstate(pmlmepriv, _FW_LINKED)) ||
@@ -1745,7 +1745,7 @@ static int rtw_wx_set_enc(struct net_device *dev, 
	struct ndis_802_11_wep	 wep;

	enum ndis_802_11_auth_mode authmode;



	struct iw_point *erq = &(wrqu->encoding);

	struct iw_point *erq = &wrqu->encoding;

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

	struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv;

	DBG_88E("+rtw_wx_set_enc, flags = 0x%x\n", erq->flags);
@@ -1860,8 +1860,8 @@ static int rtw_wx_get_enc(struct net_device *dev, 
{

	uint key, ret = 0;

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

	struct iw_point *erq = &(wrqu->encoding);

	struct	mlme_priv	*pmlmepriv = &(padapter->mlmepriv);

	struct iw_point *erq = &wrqu->encoding;

	struct	mlme_priv	*pmlmepriv = &padapter->mlmepriv;
@@ -1949,7 +1949,7 @@ static int rtw_wx_set_auth(struct net_device *dev, 
			     union iwreq_data *wrqu, char *extra)

{

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

	struct iw_param *param = (struct iw_param *)&(wrqu->param);

	struct iw_param *param = (struct iw_param *)&wrqu->param;

	int ret = 0;



	switch (param->flags & IW_AUTH_INDEX) {
@@ -2477,8 +2477,8 @@ static int rtw_get_ap_info(struct net_device *dev, 
	char data[32];

	struct wlan_network *pnetwork = NULL;

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

	struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);

	struct __queue *queue = &(pmlmepriv->scanned_queue);

	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;

	struct __queue *queue = &pmlmepriv->scanned_queue;

	struct iw_point *pdata = &wrqu->data;



	DBG_88E("+rtw_get_aplist_info\n");
@@ -2622,7 +2622,7 @@ static int rtw_wext_p2p_enable(struct net_device *dev, 
{

	int ret = 0;

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

	struct wifidirect_info *pwdinfo = &(padapter->wdinfo);

	struct wifidirect_info *pwdinfo = &padapter->wdinfo;

	struct mlme_ext_priv	*pmlmeext = &padapter->mlmeextpriv;

	enum P2P_ROLE init_role = P2P_ROLE_DISABLE;
@@ -2672,7 +2672,7 @@ static int rtw_p2p_set_go_nego_ssid(struct net_device *dev, 
{

	int ret = 0;

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

	struct wifidirect_info *pwdinfo = &(padapter->wdinfo);

	struct wifidirect_info *pwdinfo = &padapter->wdinfo;



	DBG_88E("[%s] ssid = %s, len = %zu\n", __func__, extra, strlen(extra));

	memcpy(pwdinfo->nego_ssid, extra, strlen(extra));
@@ -2687,7 +2687,7 @@ static int rtw_p2p_set_intent(struct net_device *dev, 
{

	int ret = 0;

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

	struct wifidirect_info *pwdinfo = &(padapter->wdinfo);

	struct wifidirect_info *pwdinfo = &padapter->wdinfo;

	u8 intent = pwdinfo->intent;



	switch (wrqu->data.length) {
@@ -2712,7 +2712,7 @@ static int rtw_p2p_set_listen_ch(struct net_device *dev, 
{

	int ret = 0;

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

	struct wifidirect_info *pwdinfo = &(padapter->wdinfo);

	struct wifidirect_info *pwdinfo = &padapter->wdinfo;

	u8 listen_ch = pwdinfo->listen_channel;	/*	Listen channel number */



	switch (wrqu->data.length) {
@@ -2745,7 +2745,7 @@ static int rtw_p2p_set_op_ch(struct net_device *dev, 


	int ret = 0;

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

	struct wifidirect_info *pwdinfo = &(padapter->wdinfo);

	struct wifidirect_info *pwdinfo = &padapter->wdinfo;

	u8 op_ch = pwdinfo->operating_channel;	/*	Operating channel number */



	switch (wrqu->data.length) {
@@ -2773,7 +2773,7 @@ static int rtw_p2p_profilefound(struct net_device *dev, 
{

	int ret = 0;

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

	struct wifidirect_info *pwdinfo = &(padapter->wdinfo);

	struct wifidirect_info *pwdinfo = &padapter->wdinfo;



	/*	Comment by Albert 2010/10/13 */

	/*	Input data format: */
@@ -2820,7 +2820,7 @@ static int rtw_p2p_setDN(struct net_device *dev, 
{

	int ret = 0;

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

	struct wifidirect_info *pwdinfo = &(padapter->wdinfo);

	struct wifidirect_info *pwdinfo = &padapter->wdinfo;



	DBG_88E("[%s] %s %d\n", __func__, extra, wrqu->data.length - 1);

	memset(pwdinfo->device_name, 0x00, WPS_MAX_DEVICE_NAME_LEN);
@@ -2836,7 +2836,7 @@ static int rtw_p2p_get_status(struct net_device *dev, 
{

	int ret = 0;

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

	struct wifidirect_info *pwdinfo = &(padapter->wdinfo);

	struct wifidirect_info *pwdinfo = &padapter->wdinfo;



	if (padapter->bShowGetP2PState)

		DBG_88E("[%s] Role = %d, Status = %d, peer addr = %.2X:%.2X:%.2X:%.2X:%.2X:%.2X\n", __func__, rtw_p2p_role(pwdinfo), rtw_p2p_state(pwdinfo),
@@ -2863,7 +2863,7 @@ static int rtw_p2p_get_req_cm(struct net_device *dev, 
{

	int ret = 0;

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

	struct wifidirect_info *pwdinfo = &(padapter->wdinfo);

	struct wifidirect_info *pwdinfo = &padapter->wdinfo;



	sprintf(extra, "\n\nCM =%s\n", pwdinfo->rx_prov_disc_info.strconfig_method_desc_of_prov_disc_req);

	wrqu->data.length = strlen(extra);
@@ -2876,7 +2876,7 @@ static int rtw_p2p_get_role(struct net_device *dev, 
{

	int ret = 0;

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

	struct wifidirect_info *pwdinfo = &(padapter->wdinfo);

	struct wifidirect_info *pwdinfo = &padapter->wdinfo;



	DBG_88E("[%s] Role = %d, Status = %d, peer addr = %.2X:%.2X:%.2X:%.2X:%.2X:%.2X\n", __func__, rtw_p2p_role(pwdinfo), rtw_p2p_state(pwdinfo),

			pwdinfo->p2p_peer_interface_addr[0], pwdinfo->p2p_peer_interface_addr[1], pwdinfo->p2p_peer_interface_addr[2],
@@ -2893,7 +2893,7 @@ static int rtw_p2p_get_peer_ifaddr(struct net_device *dev, 
{

	int ret = 0;

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

	struct wifidirect_info *pwdinfo = &(padapter->wdinfo);

	struct wifidirect_info *pwdinfo = &padapter->wdinfo;



	DBG_88E("[%s] Role = %d, Status = %d, peer addr = %pM\n", __func__,

		rtw_p2p_role(pwdinfo), rtw_p2p_state(pwdinfo),
@@ -2911,7 +2911,7 @@ static int rtw_p2p_get_peer_devaddr(struct net_device *dev, 
{

	int ret = 0;

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

	struct wifidirect_info *pwdinfo = &(padapter->wdinfo);

	struct wifidirect_info *pwdinfo = &padapter->wdinfo;



	DBG_88E("[%s] Role = %d, Status = %d, peer addr = %pM\n", __func__,

		rtw_p2p_role(pwdinfo), rtw_p2p_state(pwdinfo),
@@ -2929,7 +2929,7 @@ static int rtw_p2p_get_peer_devaddr_by_invitation(struct net_device *dev, 
{

	int ret = 0;

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

	struct wifidirect_info *pwdinfo = &(padapter->wdinfo);

	struct wifidirect_info *pwdinfo = &padapter->wdinfo;



	DBG_88E("[%s] Role = %d, Status = %d, peer addr = %pM\n",

		__func__, rtw_p2p_role(pwdinfo), rtw_p2p_state(pwdinfo),
@@ -2947,7 +2947,7 @@ static int rtw_p2p_get_groupid(struct net_device *dev, 
{

	int ret = 0;

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

	struct wifidirect_info *pwdinfo = &(padapter->wdinfo);

	struct wifidirect_info *pwdinfo = &padapter->wdinfo;



	sprintf(extra, "\n%.2X:%.2X:%.2X:%.2X:%.2X:%.2X %s",

		pwdinfo->groupid_info.go_device_addr[0], pwdinfo->groupid_info.go_device_addr[1],
@@ -2965,7 +2965,7 @@ static int rtw_p2p_get_op_ch(struct net_device *dev, 
{

	int ret = 0;

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

	struct wifidirect_info *pwdinfo = &(padapter->wdinfo);

	struct wifidirect_info *pwdinfo = &padapter->wdinfo;



	DBG_88E("[%s] Op_ch = %02x\n", __func__, pwdinfo->operating_channel);
@@ -2985,7 +2985,7 @@ static int rtw_p2p_get_wps_configmethod(struct net_device *dev, 
	u8 peerMACStr[17] = {0x00};

	struct mlme_priv		*pmlmepriv = &padapter->mlmepriv;

	struct list_head *plist, *phead;

	struct __queue *queue	= &(pmlmepriv->scanned_queue);

	struct __queue *queue	= &pmlmepriv->scanned_queue;

	struct	wlan_network	*pnetwork = NULL;

	u8 blnMatch = 0;

	u16	attr_content = 0;
@@ -3053,7 +3053,7 @@ static int rtw_p2p_get_go_device_address(struct net_device *dev, 
	u8 peerMACStr[17] = {0x00};

	struct mlme_priv		*pmlmepriv = &padapter->mlmepriv;

	struct list_head *plist, *phead;

	struct __queue *queue	= &(pmlmepriv->scanned_queue);

	struct __queue *queue	= &pmlmepriv->scanned_queue;

	struct	wlan_network	*pnetwork = NULL;

	u8 blnMatch = 0;

	u8 *p2pie;
@@ -3136,7 +3136,7 @@ static int rtw_p2p_get_device_type(struct net_device *dev, 
	u8 peerMACStr[17] = {0x00};

	struct mlme_priv		*pmlmepriv = &padapter->mlmepriv;

	struct list_head *plist, *phead;

	struct __queue *queue	= &(pmlmepriv->scanned_queue);

	struct __queue *queue	= &pmlmepriv->scanned_queue;

	struct	wlan_network	*pnetwork = NULL;

	u8 blnMatch = 0;

	u8 dev_type[8] = {0x00};
@@ -3212,7 +3212,7 @@ static int rtw_p2p_get_device_name(struct net_device *dev, 
	u8 peerMACStr[17] = {0x00};

	struct mlme_priv		*pmlmepriv = &padapter->mlmepriv;

	struct list_head *plist, *phead;

	struct __queue *queue	= &(pmlmepriv->scanned_queue);

	struct __queue *queue	= &pmlmepriv->scanned_queue;

	struct	wlan_network	*pnetwork = NULL;

	u8 blnMatch = 0;

	u8 dev_name[WPS_MAX_DEVICE_NAME_LEN] = {0x00};
@@ -3278,7 +3278,7 @@ static int rtw_p2p_get_invitation_procedure(struct net_device *dev, 
	u8 peerMACStr[17] = {0x00};

	struct mlme_priv		*pmlmepriv = &padapter->mlmepriv;

	struct list_head *plist, *phead;

	struct __queue *queue	= &(pmlmepriv->scanned_queue);

	struct __queue *queue	= &pmlmepriv->scanned_queue;

	struct	wlan_network	*pnetwork = NULL;

	u8 blnMatch = 0;

	u8 *p2pie;
@@ -3349,12 +3349,12 @@ static int rtw_p2p_connect(struct net_device *dev, 
{

	int ret = 0;

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

	struct wifidirect_info *pwdinfo = &(padapter->wdinfo);

	struct wifidirect_info *pwdinfo = &padapter->wdinfo;

	u8 peerMAC[ETH_ALEN] = {0x00};

	int jj, kk;

	struct mlme_priv		*pmlmepriv = &padapter->mlmepriv;

	struct list_head *plist, *phead;

	struct __queue *queue	= &(pmlmepriv->scanned_queue);

	struct __queue *queue	= &pmlmepriv->scanned_queue;

	struct	wlan_network	*pnetwork = NULL;

	uint uintPeerChannel = 0;
@@ -3428,11 +3428,11 @@ static int rtw_p2p_invite_req(struct net_device *dev, 
{

	int ret = 0;

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

	struct wifidirect_info *pwdinfo = &(padapter->wdinfo);

	struct wifidirect_info *pwdinfo = &padapter->wdinfo;

	int jj, kk;

	struct mlme_priv	*pmlmepriv = &padapter->mlmepriv;

	struct list_head *plist, *phead;

	struct __queue *queue	= &(pmlmepriv->scanned_queue);

	struct __queue *queue	= &pmlmepriv->scanned_queue;

	struct	wlan_network	*pnetwork = NULL;

	uint uintPeerChannel = 0;

	u8 attr_content[50] = {0x00};
@@ -3537,7 +3537,7 @@ static int rtw_p2p_set_persistent(struct net_device *dev, 
{

	int ret = 0;

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

	struct wifidirect_info *pwdinfo = &(padapter->wdinfo);

	struct wifidirect_info *pwdinfo = &padapter->wdinfo;



	/*	The input data is 0 or 1 */

	/*	0: disable persistent group functionality */
@@ -3566,12 +3566,12 @@ static int rtw_p2p_prov_disc(struct net_device *dev, 
{

	int ret = 0;

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

	struct wifidirect_info *pwdinfo = &(padapter->wdinfo);

	struct wifidirect_info *pwdinfo = &padapter->wdinfo;

	u8 peerMAC[ETH_ALEN] = {0x00};

	int jj, kk;

	struct mlme_priv		*pmlmepriv = &padapter->mlmepriv;

	struct list_head *plist, *phead;

	struct __queue *queue	= &(pmlmepriv->scanned_queue);

	struct __queue *queue	= &pmlmepriv->scanned_queue;

	struct	wlan_network	*pnetwork = NULL;

	uint uintPeerChannel = 0;

	u8 attr_content[100] = {0x00};
@@ -3698,7 +3698,7 @@ static int rtw_p2p_got_wpsinfo(struct net_device *dev, 
{

	int ret = 0;

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

	struct wifidirect_info *pwdinfo = &(padapter->wdinfo);

	struct wifidirect_info *pwdinfo = &padapter->wdinfo;



	DBG_88E("[%s] data = %s\n", __func__, extra);

	/*	Added by Albert 20110328 */
@@ -4000,11 +4000,11 @@ static int rtw_dbg_port(struct net_device *dev, 
	u32 *pdata, val32;

	struct sta_info *psta;

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

	struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);

	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;

	struct mlme_ext_priv	*pmlmeext = &padapter->mlmeextpriv;

	struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);

	struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;

	struct security_priv *psecuritypriv = &padapter->securitypriv;

	struct wlan_network *cur_network = &(pmlmepriv->cur_network);

	struct wlan_network *cur_network = &pmlmepriv->cur_network;

	struct sta_priv *pstapriv = &padapter->stapriv;



	pdata = (u32 *)&wrqu->data;
@@ -4311,7 +4311,7 @@ static int rtw_dbg_port(struct net_device *dev, 
				spin_lock_bh(&pstapriv->sta_hash_lock);



				for (i = 0; i < NUM_STA; i++) {

					phead = &(pstapriv->sta_hash[i]);

					phead = &pstapriv->sta_hash[i];

					plist = phead->next;



					while (phead != plist) {
@@ -4680,7 +4680,7 @@ static int set_group_key(struct adapter *padapter, u8 *key, u8 alg, int keyid) 
	u8 keylen;

	struct cmd_obj *pcmd;

	struct setkey_parm *psetkeyparm;

	struct cmd_priv	*pcmdpriv = &(padapter->cmdpriv);

	struct cmd_priv	*pcmdpriv = &padapter->cmdpriv;

	int res = _SUCCESS;



	DBG_88E("%s\n", __func__);
@@ -4719,7 +4719,7 @@ static int set_group_key(struct adapter *padapter, u8 *key, u8 alg, int keyid) 
		keylen = 16;

	}



	memcpy(&(psetkeyparm->key[0]), key, keylen);

	memcpy(&psetkeyparm->key[0], key, keylen);



	pcmd->cmdcode = _SetKey_CMD_;

	pcmd->parmbuf = (u8 *)psetkeyparm;
@@ -4762,7 +4762,7 @@ static int rtw_set_encryption(struct net_device *dev, struct ieee_param *param, 
	struct sta_info *psta = NULL, *pbcmc_sta = NULL;

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

	struct mlme_priv	*pmlmepriv = &padapter->mlmepriv;

	struct security_priv *psecuritypriv = &(padapter->securitypriv);

	struct security_priv *psecuritypriv = &padapter->securitypriv;

	struct sta_priv *pstapriv = &padapter->stapriv;



	DBG_88E("%s\n", __func__);
@@ -4833,7 +4833,7 @@ static int rtw_set_encryption(struct net_device *dev, struct ieee_param *param, 


			psecuritypriv->dot11PrivacyKeyIndex = wep_key_idx;



			memcpy(&(psecuritypriv->dot11DefKey[wep_key_idx].skey[0]), pwep->KeyMaterial, pwep->KeyLength);

			memcpy(&psecuritypriv->dot11DefKey[wep_key_idx].skey[0], pwep->KeyMaterial, pwep->KeyLength);



			psecuritypriv->dot11DefKeylen[wep_key_idx] = pwep->KeyLength;
@@ -4844,7 +4844,7 @@ static int rtw_set_encryption(struct net_device *dev, struct ieee_param *param, 
			/* don't update "psecuritypriv->dot11PrivacyAlgrthm" and */

			/* psecuritypriv->dot11PrivacyKeyIndex = keyid", but can rtw_set_key to cam */



		      memcpy(&(psecuritypriv->dot11DefKey[wep_key_idx].skey[0]), pwep->KeyMaterial, pwep->KeyLength);

		      memcpy(&psecuritypriv->dot11DefKey[wep_key_idx].skey[0], pwep->KeyMaterial, pwep->KeyLength);



			psecuritypriv->dot11DefKeylen[wep_key_idx] = pwep->KeyLength;
@@ -4871,8 +4871,8 @@ static int rtw_set_encryption(struct net_device *dev, struct ieee_param *param, 
				memcpy(psecuritypriv->dot118021XGrpKey[param->u.crypt.idx].skey,

					    param->u.crypt.key, (param->u.crypt.key_len > 16 ? 16 : param->u.crypt.key_len));

				/* set mic key */

				memcpy(psecuritypriv->dot118021XGrptxmickey[param->u.crypt.idx].skey, &(param->u.crypt.key[16]), 8);

				memcpy(psecuritypriv->dot118021XGrprxmickey[param->u.crypt.idx].skey, &(param->u.crypt.key[24]), 8);

				memcpy(psecuritypriv->dot118021XGrptxmickey[param->u.crypt.idx].skey, &param->u.crypt.key[16], 8);

				memcpy(psecuritypriv->dot118021XGrprxmickey[param->u.crypt.idx].skey, &param->u.crypt.key[24], 8);



				psecuritypriv->busetkipkey = true;

			} else if (strcmp(param->u.crypt.alg, "CCMP") == 0) {
@@ -4914,8 +4914,8 @@ static int rtw_set_encryption(struct net_device *dev, struct ieee_param *param, 
					psta->dot118021XPrivacy = _TKIP_;



					/* set mic key */

					memcpy(psta->dot11tkiptxmickey.skey, &(param->u.crypt.key[16]), 8);

					memcpy(psta->dot11tkiprxmickey.skey, &(param->u.crypt.key[24]), 8);

					memcpy(psta->dot11tkiptxmickey.skey, &param->u.crypt.key[16], 8);

					memcpy(psta->dot11tkiprxmickey.skey, &param->u.crypt.key[24], 8);



					psecuritypriv->busetkipkey = true;

				} else if (strcmp(param->u.crypt.alg, "CCMP") == 0) {
@@ -4945,8 +4945,8 @@ static int rtw_set_encryption(struct net_device *dev, struct ieee_param *param, 
						    param->u.crypt.key, (param->u.crypt.key_len > 16 ? 16 : param->u.crypt.key_len));



					/* set mic key */

					memcpy(psecuritypriv->dot118021XGrptxmickey[param->u.crypt.idx].skey, &(param->u.crypt.key[16]), 8);

					memcpy(psecuritypriv->dot118021XGrprxmickey[param->u.crypt.idx].skey, &(param->u.crypt.key[24]), 8);

					memcpy(psecuritypriv->dot118021XGrptxmickey[param->u.crypt.idx].skey, &param->u.crypt.key[16], 8);

					memcpy(psecuritypriv->dot118021XGrprxmickey[param->u.crypt.idx].skey, &param->u.crypt.key[24], 8);



					psecuritypriv->busetkipkey = true;

				} else if (strcmp(param->u.crypt.alg, "CCMP") == 0) {
@@ -4986,7 +4986,7 @@ static int rtw_set_beacon(struct net_device *dev, struct ieee_param *param, int 
{

	int ret = 0;

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

	struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);

	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;

	struct sta_priv *pstapriv = &padapter->stapriv;

	unsigned char *pbuf = param->u.bcn_ie.buf;
@@ -5027,7 +5027,7 @@ static int rtw_add_sta(struct net_device *dev, struct ieee_param *param) 
	int ret = 0;

	struct sta_info *psta = NULL;

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

	struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);

	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;

	struct sta_priv *pstapriv = &padapter->stapriv;



	DBG_88E("rtw_add_sta(aid =%d) =%pM\n", param->u.add_sta.aid, (param->sta_addr));
@@ -5082,7 +5082,7 @@ static int rtw_del_sta(struct net_device *dev, struct ieee_param *param) 
	int ret = 0;

	struct sta_info *psta = NULL;

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

	struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);

	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;

	struct sta_priv *pstapriv = &padapter->stapriv;

	int updated = 0;
@@ -5119,7 +5119,7 @@ static int rtw_ioctl_get_sta_data(struct net_device *dev, struct ieee_param *par 
	int ret = 0;

	struct sta_info *psta = NULL;

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

	struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);

	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;

	struct sta_priv *pstapriv = &padapter->stapriv;

	struct ieee_param_ex *param_ex = (struct ieee_param_ex *)param;

	struct sta_data *psta_data = (struct sta_data *)param_ex->data;
@@ -5176,7 +5176,7 @@ static int rtw_get_sta_wpaie(struct net_device *dev, struct ieee_param *param) 
	int ret = 0;

	struct sta_info *psta = NULL;

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

	struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);

	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;

	struct sta_priv *pstapriv = &padapter->stapriv;



	DBG_88E("rtw_get_sta_wpaie, sta_addr: %pM\n", (param->sta_addr));
@@ -5214,8 +5214,8 @@ static int rtw_set_wps_beacon(struct net_device *dev, struct ieee_param *param, 
	int ret = 0;

	unsigned char wps_oui[4] = {0x0, 0x50, 0xf2, 0x04};

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

	struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);

	struct mlme_ext_priv	*pmlmeext = &(padapter->mlmeextpriv);

	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;

	struct mlme_ext_priv	*pmlmeext = &padapter->mlmeextpriv;

	int ie_len;



	DBG_88E("%s, len =%d\n", __func__, len);
@@ -5252,7 +5252,7 @@ static int rtw_set_wps_probe_resp(struct net_device *dev, struct ieee_param *par 
{

	int ret = 0;

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

	struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);

	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;

	int ie_len;



	DBG_88E("%s, len =%d\n", __func__, len);
@@ -5284,7 +5284,7 @@ static int rtw_set_wps_assoc_resp(struct net_device *dev, struct ieee_param *par 
{

	int ret = 0;

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

	struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);

	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;

	int ie_len;



	DBG_88E("%s, len =%d\n", __func__, len);
@@ -5317,9 +5317,9 @@ static int rtw_set_hidden_ssid(struct net_device *dev, struct ieee_param *param, 
{

	int ret = 0;

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

	struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);

	struct mlme_ext_priv	*pmlmeext = &(padapter->mlmeextpriv);

	struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);

	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;

	struct mlme_ext_priv	*pmlmeext = &padapter->mlmeextpriv;

	struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;



	u8 value;
@@ -5342,7 +5342,7 @@ static int rtw_ioctl_acl_remove_sta(struct net_device *dev, struct ieee_param *p 
{

	int ret = 0;

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

	struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);

	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;



	if (check_fwstate(pmlmepriv, WIFI_AP_STATE) != true)

		return -EINVAL;
@@ -5359,7 +5359,7 @@ static int rtw_ioctl_acl_add_sta(struct net_device *dev, struct ieee_param *para 
{

	int ret = 0;

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

	struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);

	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;



	if (check_fwstate(pmlmepriv, WIFI_AP_STATE) != true)

		return -EINVAL;
@@ -5376,7 +5376,7 @@ static int rtw_ioctl_set_macaddr_acl(struct net_device *dev, struct ieee_param * 
{

	int ret = 0;

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

	struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);

	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;



	if (check_fwstate(pmlmepriv, WIFI_AP_STATE) != true)

		return -EINVAL;
@@ -5503,7 +5503,7 @@ static int rtw_wx_set_priv(struct net_device *dev, 
	/* added for wps2.0 @20110524 */

	if (dwrq->flags == 0x8766 && len > 8) {

		u32 cp_sz;

		struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);

		struct mlme_priv *pmlmepriv = &padapter->mlmepriv;

		u8 *probereq_wpsie = ext;

		int probereq_wpsie_len = len;

		u8 wps_oui[4] = {0x0, 0x50, 0xf2, 0x04};

drivers/staging/r8188eu/os_dep/os_intfs.c

+2 −2
Original line number Diff line number Diff line
@@ -591,8 +591,8 @@ static int rtw_net_set_mac_address(struct net_device *pnetdev, void *p) 
static struct net_device_stats *rtw_net_get_stats(struct net_device *pnetdev)

{

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

	struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);

	struct recv_priv *precvpriv = &(padapter->recvpriv);

	struct xmit_priv *pxmitpriv = &padapter->xmitpriv;

	struct recv_priv *precvpriv = &padapter->recvpriv;



	padapter->stats.tx_packets = pxmitpriv->tx_pkts;/* pxmitpriv->tx_pkts++; */

	padapter->stats.rx_packets = precvpriv->rx_pkts;/* precvpriv->rx_pkts++; */

drivers/staging/r8188eu/os_dep/osdep_service.c

+2 −2
Original line number Diff line number Diff line
@@ -96,8 +96,8 @@ void _rtw_mutex_free(struct mutex *pmutex) 


void	_rtw_init_queue(struct __queue *pqueue)

{

	INIT_LIST_HEAD(&(pqueue->queue));

	spin_lock_init(&(pqueue->lock));

	INIT_LIST_HEAD(&pqueue->queue);

	spin_lock_init(&pqueue->lock);

}



inline u32 rtw_systime_to_ms(u32 systime)

drivers/staging/r8188eu/os_dep/recv_linux.c

+2 −2
Original line number Diff line number Diff line
@@ -114,8 +114,8 @@ int rtw_recv_indicatepkt(struct adapter *padapter, 
	struct sk_buff *skb;

	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;



	precvpriv = &(padapter->recvpriv);

	pfree_recv_queue = &(precvpriv->free_recv_queue);

	precvpriv = &padapter->recvpriv;

	pfree_recv_queue = &precvpriv->free_recv_queue;



	skb = precv_frame->pkt;

	if (!skb)

drivers/staging/r8188eu/os_dep/rtw_android.c

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ static int rtw_android_get_rssi(struct net_device *net, char *command, 
				int total_len)

{

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

	struct	mlme_priv	*pmlmepriv = &(padapter->mlmepriv);

	struct	mlme_priv	*pmlmepriv = &padapter->mlmepriv;

	struct	wlan_network	*pcur_network = &pmlmepriv->cur_network;

	int bytes_written = 0;