Commit 40e05e86 authored by Chaehyun Lim's avatar Chaehyun Lim Committed by Greg Kroah-Hartman
Browse files

staging: wilc1000: rename u8ssidnum in struct hidden_network 



This patch renames u8ssidnum to n_ssids that is a member of struct
hidden_network. There is no need to use u8 prefix to show data type so
just rename it.

Signed-off-by: default avatarChaehyun Lim <chaehyun.lim@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 245a1865

drivers/staging/wilc1000/host_interface.c

+5 −5
Original line number Diff line number Diff line
@@ -829,18 +829,18 @@ static s32 Handle_Scan(struct wilc_vif *vif, 
	strWIDList[u32WidsCount].id = (u16)WID_SSID_PROBE_REQ;

	strWIDList[u32WidsCount].type = WID_STR;



	for (i = 0; i < pstrHostIFscanAttr->hidden_network.u8ssidnum; i++)

	for (i = 0; i < pstrHostIFscanAttr->hidden_network.n_ssids; i++)

		valuesize += ((pstrHostIFscanAttr->hidden_network.net_info[i].ssid_len) + 1);

	pu8HdnNtwrksWidVal = kmalloc(valuesize + 1, GFP_KERNEL);

	strWIDList[u32WidsCount].val = pu8HdnNtwrksWidVal;

	if (strWIDList[u32WidsCount].val) {

		pu8Buffer = strWIDList[u32WidsCount].val;



		*pu8Buffer++ = pstrHostIFscanAttr->hidden_network.u8ssidnum;

		*pu8Buffer++ = pstrHostIFscanAttr->hidden_network.n_ssids;



		PRINT_D(HOSTINF_DBG, "In Handle_ProbeRequest number of ssid %d\n", pstrHostIFscanAttr->hidden_network.u8ssidnum);

		PRINT_D(HOSTINF_DBG, "In Handle_ProbeRequest number of ssid %d\n", pstrHostIFscanAttr->hidden_network.n_ssids);



		for (i = 0; i < pstrHostIFscanAttr->hidden_network.u8ssidnum; i++) {

		for (i = 0; i < pstrHostIFscanAttr->hidden_network.n_ssids; i++) {

			*pu8Buffer++ = pstrHostIFscanAttr->hidden_network.net_info[i].ssid_len;

			memcpy(pu8Buffer, pstrHostIFscanAttr->hidden_network.net_info[i].ssid, pstrHostIFscanAttr->hidden_network.net_info[i].ssid_len);

			pu8Buffer += pstrHostIFscanAttr->hidden_network.net_info[i].ssid_len;
@@ -3692,7 +3692,7 @@ s32 wilc_scan(struct wilc_vif *vif, u8 u8ScanSource, u8 u8ScanType, 


	if (pstrHiddenNetwork) {

		msg.body.scan_info.hidden_network.net_info = pstrHiddenNetwork->net_info;

		msg.body.scan_info.hidden_network.u8ssidnum = pstrHiddenNetwork->u8ssidnum;

		msg.body.scan_info.hidden_network.n_ssids = pstrHiddenNetwork->n_ssids;



	} else

		PRINT_D(HOSTINF_DBG, "pstrHiddenNetwork IS EQUAL TO NULL\n");

drivers/staging/wilc1000/host_interface.h

+1 −1
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ struct hidden_net_info { 


struct hidden_network {

	struct hidden_net_info *net_info;

	u8 u8ssidnum;

	u8 n_ssids;

};



struct user_scan_req {

drivers/staging/wilc1000/wilc_wfi_cfgoperations.c

+2 −2
Original line number Diff line number Diff line
@@ -645,7 +645,7 @@ static int scan(struct wiphy *wiphy, struct cfg80211_scan_request *request) 


		if (request->n_ssids >= 1) {

			strHiddenNetwork.net_info = kmalloc(request->n_ssids * sizeof(struct hidden_network), GFP_KERNEL);

			strHiddenNetwork.u8ssidnum = request->n_ssids;

			strHiddenNetwork.n_ssids = request->n_ssids;





			for (i = 0; i < request->n_ssids; i++) {
@@ -656,7 +656,7 @@ static int scan(struct wiphy *wiphy, struct cfg80211_scan_request *request) 
					strHiddenNetwork.net_info[i].ssid_len = request->ssids[i].ssid_len;

				} else {

					PRINT_D(CFG80211_DBG, "Received one NULL SSID\n");

					strHiddenNetwork.u8ssidnum -= 1;

					strHiddenNetwork.n_ssids -= 1;

				}

			}

			PRINT_D(CFG80211_DBG, "Trigger Scan Request\n");