[PATCH] mwifiex: do not short circuit exit from mwifiex_set_mgmt_ies

[PATCH] mwifiex: do not short circuit exit from mwifiex_set_mgmt_ies

[John W. Linville]

Without this change, the code simply exits after calling
mwifiex_uap_set_head_tail_ies, leving the call to
mwifiex_set_mgmt_beacon_data_ies as dead code.

Coverity CID #1271292

Signed-off-by: John W. Linville <linville@tuxdriver.com>
---
 drivers/net/wireless/mwifiex/ie.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/net/wireless/mwifiex/ie.c b/drivers/net/wireless/mwifiex/ie.c
index 0ba894509413..23e368c77c08 100644
--- a/drivers/net/wireless/mwifiex/ie.c
+++ b/drivers/net/wireless/mwifiex/ie.c
@@ -409,6 +409,8 @@ int mwifiex_set_mgmt_ies(struct mwifiex_private *priv,
 	int ret;
 
 	ret = mwifiex_uap_parse_tail_ies(priv, info);
+
+	if (ret)
 		return ret;
 
 	return mwifiex_set_mgmt_beacon_data_ies(priv, info);
-- 
2.1.0

RE: [PATCH] mwifiex: do not short circuit exit from mwifiex_set_mgmt_ies

[Amitkumar Karwar]

Hi John,

> From: John W. Linville [mailto:linville@tuxdriver.com]
> Sent: Wednesday, June 24, 2015 12:34 AM
> To: linux-wireless@vger.kernel.org
> Cc: Amitkumar Karwar; Avinash Patil; Kalle Valo; John W. Linville
> Subject: [PATCH] mwifiex: do not short circuit exit from
> mwifiex_set_mgmt_ies
> 
> Without this change, the code simply exits after calling
> mwifiex_uap_set_head_tail_ies, leving the call to
> mwifiex_set_mgmt_beacon_data_ies as dead code.
> 
> Coverity CID #1271292
> 
> Signed-off-by: John W. Linville <linville@tuxdriver.com>

Acked-by: Amitkumar Karwar <akarwar@marvell.com>

Thanks,
Amitkumar

Re: mwifiex: do not short circuit exit from mwifiex_set_mgmt_ies

[Kalle Valo]

> Without this change, the code simply exits after calling
> mwifiex_uap_set_head_tail_ies, leving the call to
> mwifiex_set_mgmt_beacon_data_ies as dead code.
> 
> Coverity CID #1271292
> 
> Signed-off-by: John W. Linville <linville@tuxdriver.com>
> Acked-by: Amitkumar Karwar <akarwar@marvell.com>

Thanks, applied to wireless-drivers-next.git.

Kalle Valo