Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40a46d8b authored by Masanari Iida's avatar Masanari Iida Committed by Greg Kroah-Hartman
Browse files

staging: rtl8188eu: Fix typo in rtl8188eu/core 



Fix spelling typo in comments and printk within
rtl8188eu/core

Signed-off-by: default avatarMasanari Iida <standby24x7@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f8cfc023

drivers/staging/rtl8188eu/core/rtw_ap.c

+7 −7
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ static void update_BCNTIM(struct adapter *padapter) 
		} else {

			tim_ielen = 0;



			/* calucate head_len */

			/* calculate head_len */

			offset = _FIXED_IE_LENGTH_;

			offset += pnetwork_mlmeext->Ssid.SsidLength + 2;
@@ -129,7 +129,7 @@ static void update_BCNTIM(struct adapter *padapter) 
		*dst_ie++ = tim_ielen;



		*dst_ie++ = 0;/* DTIM count */

		*dst_ie++ = 1;/* DTIM peroid */

		*dst_ie++ = 1;/* DTIM period */



		if (pstapriv->tim_bitmap&BIT(0))/* for bc/mc frames */

			*dst_ie++ = BIT(0);/* bitmap ctrl */
@@ -821,7 +821,7 @@ static void start_bss_network(struct adapter *padapter, u8 *pbuf) 
	/* update cur_wireless_mode */

	update_wireless_mode(padapter);



	/* udpate capability after cur_wireless_mode updated */

	/* update capability after cur_wireless_mode updated */

	update_capinfo(padapter, rtw_get_capability((struct wlan_bssid_ex *)pnetwork));



	/* let pnetwork_mlmeext == pnetwork_mlme. */
@@ -1415,7 +1415,7 @@ void update_beacon(struct adapter *padapter, u8 ie_id, u8 *oui, u8 tx) 


/*

op_mode

Set to 0 (HT pure) under the followign conditions

Set to 0 (HT pure) under the following conditions

	- all STAs in the BSS are 20/40 MHz HT in 20/40 MHz BSS or

	- all STAs in the BSS are 20 MHz HT in 20 MHz BSS

Set to 1 (HT non-member protection) if there may be non-HT STAs
@@ -1494,7 +1494,7 @@ static int rtw_ht_operation_update(struct adapter *padapter) 


void associated_clients_update(struct adapter *padapter, u8 updated)

{

	/* update associcated stations cap. */

	/* update associated stations cap. */

	if (updated) {

		struct list_head *phead, *plist;

		struct sta_info *psta = NULL;
@@ -1647,7 +1647,7 @@ void bss_cap_update_on_sta_join(struct adapter *padapter, struct sta_info *psta) 
		update_beacon(padapter, _HT_ADD_INFO_IE_, NULL, true);

	}



	/* update associcated stations cap. */

	/* update associated stations cap. */

	associated_clients_update(padapter,  beacon_updated);



	DBG_88E("%s, updated =%d\n", __func__, beacon_updated);
@@ -1711,7 +1711,7 @@ u8 bss_cap_update_on_sta_leave(struct adapter *padapter, struct sta_info *psta) 
		update_beacon(padapter, _HT_ADD_INFO_IE_, NULL, true);

	}



	/* update associcated stations cap. */

	/* update associated stations cap. */



	DBG_88E("%s, updated =%d\n", __func__, beacon_updated);

drivers/staging/rtl8188eu/core/rtw_br_ext.c

+3 −3
Original line number Diff line number Diff line
@@ -543,10 +543,10 @@ int nat25_db_handle(struct adapter *priv, struct sk_buff *skb, int method) 
			if (!__nat25_db_network_lookup_and_replace(priv, skb, networkAddr)) {

				if (*((unsigned char *)&iph->daddr + 3) == 0xff) {

					/*  L2 is unicast but L3 is broadcast, make L2 bacome broadcast */

					DEBUG_INFO("NAT25: Set DA as boardcast\n");

					DEBUG_INFO("NAT25: Set DA as broadcast\n");

					memset(skb->data, 0xff, ETH_ALEN);

				} else {

					/*  forward unknow IP packet to upper TCP/IP */

					/*  forward unknown IP packet to upper TCP/IP */

					DEBUG_INFO("NAT25: Replace DA with BR's MAC\n");

					if ((*(u32 *)priv->br_mac) == 0 && (*(u16 *)(priv->br_mac+4)) == 0) {

						printk("Re-init netdev_br_init() due to br_mac == 0!\n");
@@ -932,7 +932,7 @@ int nat25_db_handle(struct adapter *priv, struct sk_buff *skb, int method) 
						(ph->code == PADO_CODE ? "PADO" : "PADS"),	skb->dev->name);

				} else { /*  not add relay tag */

					if (!priv->pppoe_connection_in_progress) {

						DEBUG_ERR("Discard PPPoE packet due to no connection in progresss!\n");

						DEBUG_ERR("Discard PPPoE packet due to no connection in progress!\n");

						return -1;

					}

					memcpy(skb->data, priv->pppoe_addr, ETH_ALEN);

drivers/staging/rtl8188eu/core/rtw_debug.c

+1 −1
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ int proc_get_rf_info(char *page, char **start, 
	struct mlme_ext_priv	*pmlmeext = &padapter->mlmeextpriv;

	int len = 0;



	len += snprintf(page + len, count - len, "cur_ch=%d, cur_bw=%d, cur_ch_offet=%d\n",

	len += snprintf(page + len, count - len, "cur_ch=%d, cur_bw=%d, cur_ch_offset=%d\n",

					pmlmeext->cur_channel, pmlmeext->cur_bwmode, pmlmeext->cur_ch_offset);

	*eof = 1;

	return len;

drivers/staging/rtl8188eu/core/rtw_ioctl_set.c

+2 −2
Original line number Diff line number Diff line
@@ -401,7 +401,7 @@ u8 rtw_set_802_11_infrastructure_mode(struct adapter *padapter, 


		if ((*pold_state == Ndis802_11Infrastructure) || (*pold_state == Ndis802_11IBSS)) {

			if (check_fwstate(pmlmepriv, _FW_LINKED) == true)

				rtw_indicate_disconnect(padapter); /* will clr Linked_state; before this function, we must have chked whether  issue dis-assoc_cmd or not */

				rtw_indicate_disconnect(padapter); /* will clr Linked_state; before this function, we must have checked whether  issue dis-assoc_cmd or not */

	       }



		*pold_state = networktype;
@@ -563,7 +563,7 @@ u8 rtw_set_802_11_add_wep(struct adapter *padapter, struct ndis_802_11_wep *wep) 
		break;

	}

	RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_info_,

		 ("rtw_set_802_11_add_wep:befor memcpy, wep->KeyLength = 0x%x wep->KeyIndex = 0x%x  keyid =%x\n",

		 ("rtw_set_802_11_add_wep:before memcpy, wep->KeyLength = 0x%x wep->KeyIndex = 0x%x  keyid =%x\n",

		 wep->KeyLength, wep->KeyIndex, keyid));



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

drivers/staging/rtl8188eu/core/rtw_mlme_ext.c

+18 −18
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ static struct rt_channel_plan_map RTW_ChannelPlanMap[RT_CHANNEL_DOMAIN_MAX] = { 
	{0x03},	/* 0x41, RT_CHANNEL_DOMAIN_GLOBAL_DOAMIN_2G */

};



static struct rt_channel_plan_map RTW_CHANNEL_PLAN_MAP_REALTEK_DEFINE = {0x03}; /* use the conbination for max channel numbers */

static struct rt_channel_plan_map RTW_CHANNEL_PLAN_MAP_REALTEK_DEFINE = {0x03}; /* use the combination for max channel numbers */



/*

 * Search the @param channel_num in given @param channel_set
@@ -1942,7 +1942,7 @@ void issue_p2p_GO_request(struct adapter *padapter, u8 *raddr) 
	p2pie[p2pielen++] = 0x09;	/*	WFA P2P v1.0 */



	/*	Commented by Albert 20110306 */

	/*	According to the P2P Specification, the group negoitation request frame should contain 9 P2P attributes */

	/*	According to the P2P Specification, the group negotiation request frame should contain 9 P2P attributes */

	/*	1. P2P Capability */

	/*	2. Group Owner Intent */

	/*	3. Configuration Timeout */
@@ -2307,7 +2307,7 @@ static void issue_p2p_GO_response(struct adapter *padapter, u8 *raddr, u8 *frame 
	p2pie[p2pielen++] = 0x09;	/*	WFA P2P v1.0 */



	/*	Commented by Albert 20100908 */

	/*	According to the P2P Specification, the group negoitation response frame should contain 9 P2P attributes */

	/*	According to the P2P Specification, the group negotiation response frame should contain 9 P2P attributes */

	/*	1. Status */

	/*	2. P2P Capability */

	/*	3. Group Owner Intent */
@@ -2609,7 +2609,7 @@ static void issue_p2p_GO_confirm(struct adapter *padapter, u8 *raddr, u8 result) 
	p2pie[p2pielen++] = 0x09;	/*	WFA P2P v1.0 */



	/*	Commented by Albert 20110306 */

	/*	According to the P2P Specification, the group negoitation request frame should contain 5 P2P attributes */

	/*	According to the P2P Specification, the group negotiation request frame should contain 5 P2P attributes */

	/*	1. Status */

	/*	2. P2P Capability */

	/*	3. Operating Channel */
@@ -4347,7 +4347,7 @@ struct xmit_frame *alloc_mgtxmitframe(struct xmit_priv *pxmitpriv) 


/****************************************************************************



Following are some TX fuctions for WiFi MLME

Following are some TX functions for WiFi MLME



*****************************************************************************/
@@ -5001,7 +5001,7 @@ int issue_probereq_ex(struct adapter *padapter, struct ndis_802_11_ssid *pssid, 
	return ret;

}



/*  if psta == NULL, indiate we are station(client) now... */

/*  if psta == NULL, indicate we are station(client) now... */

void issue_auth(struct adapter *padapter, struct sta_info *psta, unsigned short status)

{

	struct xmit_frame *pmgntframe;
@@ -5612,7 +5612,7 @@ void issue_assocreq(struct adapter *padapter) 
	return;

}



/* when wait_ack is ture, this function shoule be called at process context */

/* when wait_ack is true, this function should be called at process context */

static int _issue_nulldata(struct adapter *padapter, unsigned char *da, unsigned int power_mode, int wait_ack)

{

	int ret = _FAIL;
@@ -5682,7 +5682,7 @@ static int _issue_nulldata(struct adapter *padapter, unsigned char *da, unsigned 
}





/* when wait_ms > 0 , this function shoule be called at process context */

/* when wait_ms > 0 , this function should be called at process context */

/* da == NULL for station mode */

int issue_nulldata(struct adapter *padapter, unsigned char *da, unsigned int power_mode, int try_cnt, int wait_ms)

{
@@ -5692,7 +5692,7 @@ int issue_nulldata(struct adapter *padapter, unsigned char *da, unsigned int pow 
	struct mlme_ext_priv	*pmlmeext = &(padapter->mlmeextpriv);

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



	/* da == NULL, assum it's null data for sta to ap*/

	/* da == NULL, assume it's null data for sta to ap*/

	if (da == NULL)

		da = get_my_bssid(&(pmlmeinfo->network));
@@ -5727,7 +5727,7 @@ int issue_nulldata(struct adapter *padapter, unsigned char *da, unsigned int pow 
	return ret;

}



/* when wait_ack is ture, this function shoule be called at process context */

/* when wait_ack is true, this function should be called at process context */

static int _issue_qos_nulldata(struct adapter *padapter, unsigned char *da, u16 tid, int wait_ack)

{

	int ret = _FAIL;
@@ -5805,7 +5805,7 @@ static int _issue_qos_nulldata(struct adapter *padapter, unsigned char *da, u16 
	return ret;

}



/* when wait_ms > 0 , this function shoule be called at process context */

/* when wait_ms > 0 , this function should be called at process context */

/* da == NULL for station mode */

int issue_qos_nulldata(struct adapter *padapter, unsigned char *da, u16 tid, int try_cnt, int wait_ms)

{
@@ -5815,7 +5815,7 @@ int issue_qos_nulldata(struct adapter *padapter, unsigned char *da, u16 tid, int 
	struct mlme_ext_priv	*pmlmeext = &(padapter->mlmeextpriv);

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



	/* da == NULL, assum it's null data for sta to ap*/

	/* da == NULL, assume it's null data for sta to ap*/

	if (da == NULL)

		da = get_my_bssid(&(pmlmeinfo->network));
@@ -6361,7 +6361,7 @@ unsigned int send_beacon(struct adapter *padapter) 


/****************************************************************************



Following are some utitity fuctions for WiFi MLME

Following are some utility functions for WiFi MLME



*****************************************************************************/
@@ -6474,7 +6474,7 @@ void site_survey(struct adapter *padapter) 
		{

			/*  20100721:Interrupt scan operation here. */

			/*  For SW antenna diversity before link, it needs to switch to another antenna and scan again. */

			/*  It compares the scan result and select beter one to do connection. */

			/*  It compares the scan result and select better one to do connection. */

			if (rtw_hal_antdiv_before_linked(padapter)) {

				pmlmeext->sitesurvey_res.bss_cnt = 0;

				pmlmeext->sitesurvey_res.channel_idx = -1;
@@ -6713,7 +6713,7 @@ void start_create_ibss(struct adapter *padapter) 
	/* update wireless mode */

	update_wireless_mode(padapter);



	/* udpate capability */

	/* update capability */

	caps = rtw_get_capability((struct wlan_bssid_ex *)pnetwork);

	update_capinfo(padapter, caps);

	if (caps&cap_IBSS) {/* adhoc master */
@@ -6765,7 +6765,7 @@ void start_clnt_join(struct adapter *padapter) 
	/* update wireless mode */

	update_wireless_mode(padapter);



	/* udpate capability */

	/* update capability */

	caps = rtw_get_capability((struct wlan_bssid_ex *)pnetwork);

	update_capinfo(padapter, caps);

	if (caps&cap_ESS) {
@@ -7378,7 +7378,7 @@ void mlmeext_joinbss_event_callback(struct adapter *padapter, int join_res) 
	/* turn on dynamic functions */

	Switch_DM_Func(padapter, DYNAMIC_ALL_FUNC_ENABLE, true);



	/*  update IOT-releated issue */

	/*  update IOT-related issue */

	update_IOT_info(padapter);



	rtw_hal_set_hwreg(padapter, HW_VAR_BASIC_RATE, cur_network->SupportedRates);
@@ -7386,7 +7386,7 @@ void mlmeext_joinbss_event_callback(struct adapter *padapter, int join_res) 
	/* BCN interval */

	rtw_hal_set_hwreg(padapter, HW_VAR_BEACON_INTERVAL, (u8 *)(&pmlmeinfo->bcn_interval));



	/* udpate capability */

	/* update capability */

	update_capinfo(padapter, pmlmeinfo->capability);



	/* WMM, Update EDCA param */