linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: <Ajay.Kathat@microchip.com>
To: <linux-wireless@vger.kernel.org>
Cc: <devel@driverdev.osuosl.org>, <gregkh@linuxfoundation.org>,
	<Ganesh.Krishna@microchip.com>, <Aditya.Shankar@microchip.com>,
	<Adham.Abozaeid@microchip.com>, <johannes@sipsolutions.net>,
	<Ajay.Kathat@microchip.com>
Subject: [PATCH 4/8] staging: wilc1000: avoid line over 80 chars in wilc_parse_network_info()
Date: Thu, 1 Nov 2018 16:45:14 +0000	[thread overview]
Message-ID: <1541090691-31928-5-git-send-email-ajay.kathat@microchip.com> (raw)
In-Reply-To: <1541090691-31928-1-git-send-email-ajay.kathat@microchip.com>

From: Ajay Singh <ajay.kathat@microchip.com>

Use shorter name for 'network_info' variable to avoid line over 80 chars
issue.

Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>
---
 drivers/staging/wilc1000/coreconfigurator.c | 53 ++++++++++++++---------------
 1 file changed, 26 insertions(+), 27 deletions(-)

diff --git a/drivers/staging/wilc1000/coreconfigurator.c b/drivers/staging/wilc1000/coreconfigurator.c
index ac44846..2c77e5a 100644
--- a/drivers/staging/wilc1000/coreconfigurator.c
+++ b/drivers/staging/wilc1000/coreconfigurator.c
@@ -29,7 +29,7 @@ static inline u16 get_asoc_status(u8 *data)
 s32 wilc_parse_network_info(u8 *msg_buffer,
 			    struct network_info **ret_network_info)
 {
-	struct network_info *network_info;
+	struct network_info *info;
 	struct ieee80211_mgmt *mgt;
 	u8 *wid_val, *msa, *ies;
 	u16 wid_len, rx_len, ies_len;
@@ -44,70 +44,69 @@ s32 wilc_parse_network_info(u8 *msg_buffer,
 	wid_len = get_unaligned_le16(&msg_buffer[6]);
 	wid_val = &msg_buffer[8];
 
-	network_info = kzalloc(sizeof(*network_info), GFP_KERNEL);
-	if (!network_info)
+	info = kzalloc(sizeof(*info), GFP_KERNEL);
+	if (!info)
 		return -ENOMEM;
 
-	network_info->rssi = wid_val[0];
+	info->rssi = wid_val[0];
 
 	msa = &wid_val[1];
 	mgt = (struct ieee80211_mgmt *)&wid_val[1];
 	rx_len = wid_len - 1;
 
 	if (ieee80211_is_probe_resp(mgt->frame_control)) {
-		network_info->cap_info = le16_to_cpu(mgt->u.probe_resp.capab_info);
-		network_info->beacon_period = le16_to_cpu(mgt->u.probe_resp.beacon_int);
-		network_info->tsf_hi = le64_to_cpu(mgt->u.probe_resp.timestamp);
-		network_info->tsf_lo = (u32)network_info->tsf_hi;
+		info->cap_info = le16_to_cpu(mgt->u.probe_resp.capab_info);
+		info->beacon_period = le16_to_cpu(mgt->u.probe_resp.beacon_int);
+		info->tsf_hi = le64_to_cpu(mgt->u.probe_resp.timestamp);
+		info->tsf_lo = (u32)info->tsf_hi;
 		offset = offsetof(struct ieee80211_mgmt, u.probe_resp.variable);
 	} else if (ieee80211_is_beacon(mgt->frame_control)) {
-		network_info->cap_info = le16_to_cpu(mgt->u.beacon.capab_info);
-		network_info->beacon_period = le16_to_cpu(mgt->u.beacon.beacon_int);
-		network_info->tsf_hi = le64_to_cpu(mgt->u.beacon.timestamp);
-		network_info->tsf_lo = (u32)network_info->tsf_hi;
+		info->cap_info = le16_to_cpu(mgt->u.beacon.capab_info);
+		info->beacon_period = le16_to_cpu(mgt->u.beacon.beacon_int);
+		info->tsf_hi = le64_to_cpu(mgt->u.beacon.timestamp);
+		info->tsf_lo = (u32)info->tsf_hi;
 		offset = offsetof(struct ieee80211_mgmt, u.beacon.variable);
 	} else {
 		/* only process probe response and beacon frame */
-		kfree(network_info);
+		kfree(info);
 		return -EIO;
 	}
 
-	ether_addr_copy(network_info->bssid, get_bssid(mgt));
+	ether_addr_copy(info->bssid, get_bssid(mgt));
 
 	ies = mgt->u.beacon.variable;
 	ies_len = rx_len - offset;
 	if (ies_len <= 0) {
-		kfree(network_info);
+		kfree(info);
 		return -EIO;
 	}
 
-	network_info->ies = kmemdup(ies, ies_len, GFP_KERNEL);
-	if (!network_info->ies) {
-		kfree(network_info);
+	info->ies = kmemdup(ies, ies_len, GFP_KERNEL);
+	if (!info->ies) {
+		kfree(info);
 		return -ENOMEM;
 	}
 
-	network_info->ies_len = ies_len;
+	info->ies_len = ies_len;
 
 	ssid_elm = cfg80211_find_ie(WLAN_EID_SSID, ies, ies_len);
 	if (ssid_elm) {
-		network_info->ssid_len = ssid_elm[1];
-		if (network_info->ssid_len <= IEEE80211_MAX_SSID_LEN)
-			memcpy(network_info->ssid, ssid_elm + 2,
-			       network_info->ssid_len);
+		info->ssid_len = ssid_elm[1];
+		if (info->ssid_len <= IEEE80211_MAX_SSID_LEN)
+			memcpy(info->ssid, ssid_elm + 2, info->ssid_len);
 		else
-			network_info->ssid_len = 0;
+			info->ssid_len = 0;
 	}
 
 	ch_elm = cfg80211_find_ie(WLAN_EID_DS_PARAMS, ies, ies_len);
 	if (ch_elm && ch_elm[1] > 0)
-		network_info->ch = ch_elm[2];
+		info->ch = ch_elm[2];
 
 	tim_elm = cfg80211_find_ie(WLAN_EID_TIM, ies, ies_len);
 	if (tim_elm && tim_elm[1] >= 2)
-		network_info->dtim_period = tim_elm[3];
+		info->dtim_period = tim_elm[3];
 
-	*ret_network_info = network_info;
+	*ret_network_info = info;
 
 	return 0;
 }
-- 
2.7.4


  parent reply	other threads:[~2018-11-01 16:45 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-11-01 16:45 [PATCH 0/8] staging: wilc1000: make use of cfg80211 provided API's Ajay.Kathat
2018-11-01 16:45 ` [PATCH 1/8] staging: wilc1000: refactor wilc_parse_network_info() using kernel framework api's Ajay.Kathat
2018-11-01 16:45 ` [PATCH 2/8] staging: wilc1000: remove unused code in coreconfigurator Ajay.Kathat
2018-11-01 16:45 ` [PATCH 3/8] staging: wilc1000: refactor get_bssid() function Ajay.Kathat
2018-11-01 16:45 ` Ajay.Kathat [this message]
2018-11-04 19:17   ` [PATCH 4/8] staging: wilc1000: avoid line over 80 chars in wilc_parse_network_info() Joe Perches
2018-11-05  4:42     ` Ajay.Kathat
2018-11-05 10:57   ` Joe Perches
2018-11-05 12:18     ` Ajay.Kathat
2018-11-05 15:57       ` Joe Perches
2018-11-06  6:01         ` Ajay.Kathat
2018-11-01 16:45 ` [PATCH 5/8] staging: wilc1000: refactor wilc_parse_assoc_resp_info() Ajay.Kathat
2018-11-01 16:45 ` [PATCH 6/8] staging: wilc1000: remove unnecessary MAX_STRING_LEN macro Ajay.Kathat
2018-11-01 16:45 ` [PATCH 7/8] staging: wilc1000: remove coreconfigurator.c file Ajay.Kathat
2018-11-01 16:45 ` [PATCH 8/8] staging: wilc1000: remove coreconfigurator.h file Ajay.Kathat

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1541090691-31928-5-git-send-email-ajay.kathat@microchip.com \
    --to=ajay.kathat@microchip.com \
    --cc=Adham.Abozaeid@microchip.com \
    --cc=Aditya.Shankar@microchip.com \
    --cc=Ganesh.Krishna@microchip.com \
    --cc=devel@driverdev.osuosl.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=johannes@sipsolutions.net \
    --cc=linux-wireless@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).