From: SF Markus Elfring <elfring@users.sourceforge.net>
To: linux-wireless@vger.kernel.org, netdev@vger.kernel.org,
Arend Van Spriel <arend.vanspriel@broadcom.com>,
Eyal Reizer <eyalr@ti.com>, Iain Hunter <drhunter95@gmail.com>,
James Minor <james.minor@ni.com>,
Johannes Berg <johannes.berg@intel.com>,
Kalle Valo <kvalo@codeaurora.org>,
Maxim Altshul <maxim.altshul@ti.com>,
Pieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
Cc: LKML <linux-kernel@vger.kernel.org>, kernel-janitors@vger.kernel.org
Subject: [PATCH 4/5] wlcore: Use common error handling code in wlcore_set_beacon_template()
Date: Sun, 29 Oct 2017 20:14:30 +0000 [thread overview]
Message-ID: <f50c8edf-834d-9003-5a3c-dc83ec4016ce@users.sourceforge.net> (raw)
In-Reply-To: <dc2b8a7c-b4a9-2f92-12b4-a1d0d6911d7c@users.sourceforge.net>
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Sun, 29 Oct 2017 20:16:22 +0100
Adjust jump targets so that a bit of exception handling can be better
reused at the end of this function.
This issue was detected by using the Coccinelle software.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/net/wireless/ti/wlcore/main.c | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/drivers/net/wireless/ti/wlcore/main.c b/drivers/net/wireless/ti/wlcore/main.c
index 0365b5e40a8d..12a9d6509382 100644
--- a/drivers/net/wireless/ti/wlcore/main.c
+++ b/drivers/net/wireless/ti/wlcore/main.c
@@ -4024,10 +4024,9 @@ static int wlcore_set_beacon_template(struct wl1271 *wl,
wl1271_debug(DEBUG_MASTER, "beacon updated");
ret = wl1271_ssid_set(wlvif, beacon, ieoffset);
- if (ret < 0) {
- dev_kfree_skb(beacon);
- goto out;
- }
+ if (ret < 0)
+ goto free_skb;
+
min_rate = wl1271_tx_min_rate_get(wl, wlvif->basic_rate_set);
tmpl_id = is_ap ? CMD_TEMPL_AP_BEACON :
CMD_TEMPL_BEACON;
@@ -4035,10 +4034,8 @@ static int wlcore_set_beacon_template(struct wl1271 *wl,
beacon->data,
beacon->len, 0,
min_rate);
- if (ret < 0) {
- dev_kfree_skb(beacon);
- goto out;
- }
+ if (ret < 0)
+ goto free_skb;
wlvif->wmm_enabled cfg80211_find_vendor_ie(WLAN_OUI_MICROSOFT,
@@ -4051,7 +4048,7 @@ static int wlcore_set_beacon_template(struct wl1271 *wl,
* by usermode, don't use the beacon data.
*/
if (test_bit(WLVIF_FLAG_AP_PROBE_RESP_SET, &wlvif->flags))
- goto end_bcn;
+ goto free_skb;
/* remove TIM ie from probe response */
wl12xx_remove_ie(beacon, WLAN_EID_TIM, ieoffset);
@@ -4081,9 +4078,8 @@ static int wlcore_set_beacon_template(struct wl1271 *wl,
beacon->data,
beacon->len, 0,
min_rate);
-end_bcn:
+free_skb:
dev_kfree_skb(beacon);
-out:
return ret;
}
--
2.14.3
next prev parent reply other threads:[~2017-10-29 20:14 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-29 20:10 [PATCH 0/5] wlcore: Fine-tuning for three function implementations SF Markus Elfring
2017-10-29 20:11 ` [PATCH 1/5] wlcore: Use common error handling code in wlcore_nvs_cb() SF Markus Elfring
2017-10-30 13:28 ` Julian Calaby
2017-10-30 13:40 ` SF Markus Elfring
2017-10-29 20:12 ` [PATCH 2/5] wlcore: Delete an unnecessary check statement in wlcore_set_beacon_template() SF Markus Elfring
2017-10-30 13:26 ` Julian Calaby
2017-10-29 20:13 ` [PATCH 3/5] wlcore: Return directly after a failed ieee80211_beacon_get() in wlcore_set_beacon_templ SF Markus Elfring
2017-10-30 13:32 ` [PATCH 3/5] wlcore: Return directly after a failed ieee80211_beacon_get() in wlcore_set_beacon_t Julian Calaby
2017-10-29 20:14 ` SF Markus Elfring [this message]
2017-10-30 13:33 ` [PATCH 4/5] wlcore: Use common error handling code in wlcore_set_beacon_template() Julian Calaby
2017-10-30 13:44 ` SF Markus Elfring
2017-10-29 20:16 ` [PATCH 5/5] wlcore: Use common error handling code in wl1271_op_suspend() SF Markus Elfring
2017-10-30 13:40 ` Julian Calaby
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=f50c8edf-834d-9003-5a3c-dc83ec4016ce@users.sourceforge.net \
--to=elfring@users.sourceforge.net \
--cc=arend.vanspriel@broadcom.com \
--cc=drhunter95@gmail.com \
--cc=eyalr@ti.com \
--cc=james.minor@ni.com \
--cc=johannes.berg@intel.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=kvalo@codeaurora.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=maxim.altshul@ti.com \
--cc=netdev@vger.kernel.org \
--cc=pieter-paul.giesberts@broadcom.com \
/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