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

staging: wilc1000: rename u8ssidlen in struct hidden_net_info 



This patch renames u8ssidlen to ssid_len that is a member of
hidden_net_info. 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 8c6492aa

drivers/staging/wilc1000/host_interface.c

+4 −4
Original line number Diff line number Diff line
@@ -830,7 +830,7 @@ static s32 Handle_Scan(struct wilc_vif *vif, 
	strWIDList[u32WidsCount].type = WID_STR;



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

		valuesize += ((pstrHostIFscanAttr->hidden_network.pstrHiddenNetworkInfo[i].u8ssidlen) + 1);

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

	pu8HdnNtwrksWidVal = kmalloc(valuesize + 1, GFP_KERNEL);

	strWIDList[u32WidsCount].val = pu8HdnNtwrksWidVal;

	if (strWIDList[u32WidsCount].val) {
@@ -841,9 +841,9 @@ static s32 Handle_Scan(struct wilc_vif *vif, 
		PRINT_D(HOSTINF_DBG, "In Handle_ProbeRequest number of ssid %d\n", pstrHostIFscanAttr->hidden_network.u8ssidnum);



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

			*pu8Buffer++ = pstrHostIFscanAttr->hidden_network.pstrHiddenNetworkInfo[i].u8ssidlen;

			memcpy(pu8Buffer, pstrHostIFscanAttr->hidden_network.pstrHiddenNetworkInfo[i].ssid, pstrHostIFscanAttr->hidden_network.pstrHiddenNetworkInfo[i].u8ssidlen);

			pu8Buffer += pstrHostIFscanAttr->hidden_network.pstrHiddenNetworkInfo[i].u8ssidlen;

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

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

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

		}



		strWIDList[u32WidsCount].size = (s32)(valuesize + 1);

drivers/staging/wilc1000/host_interface.h

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ struct rcvd_net_info { 


struct hidden_net_info {

	u8  *ssid;

	u8 u8ssidlen;

	u8 ssid_len;

};



struct hidden_network {

drivers/staging/wilc1000/wilc_wfi_cfgoperations.c

+1 −1
Original line number Diff line number Diff line
@@ -653,7 +653,7 @@ static int scan(struct wiphy *wiphy, struct cfg80211_scan_request *request) 
				    request->ssids[i].ssid_len != 0) {

					strHiddenNetwork.pstrHiddenNetworkInfo[i].ssid = kmalloc(request->ssids[i].ssid_len, GFP_KERNEL);

					memcpy(strHiddenNetwork.pstrHiddenNetworkInfo[i].ssid, request->ssids[i].ssid, request->ssids[i].ssid_len);

					strHiddenNetwork.pstrHiddenNetworkInfo[i].u8ssidlen = request->ssids[i].ssid_len;

					strHiddenNetwork.pstrHiddenNetworkInfo[i].ssid_len = request->ssids[i].ssid_len;

				} else {

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

					strHiddenNetwork.u8ssidnum -= 1;