2016-07-02 07:21:23

by Dan Carpenter

Subject: [patch] mwifiex: fix mwifiex_add_virtual_intf()

We accidentally left some if statements out so the
mwifiex_add_virtual_intf() function returns early.

Fixes: 7311ea850079 ('mwifiex: fix AP start problem for newly added interface')
Signed-off-by: Dan Carpenter <[email protected]>

diff --git a/drivers/net/wireless/marvell/mwifiex/cfg80211.c b/drivers/net/wireless/marvell/mwifiex/cfg80211.c
index 99e8cf1..5de9f63 100644
--- a/drivers/net/wireless/marvell/mwifiex/cfg80211.c
+++ b/drivers/net/wireless/marvell/mwifiex/cfg80211.c
@@ -2865,9 +2865,11 @@ struct wireless_dev *mwifiex_add_virtual_intf(struct wiphy *wiphy,

ret = mwifiex_send_cmd(priv, HostCmd_CMD_SET_BSS_MODE,
HostCmd_ACT_GEN_SET, 0, NULL, true);
+ if (ret)
return ERR_PTR(ret);

ret = mwifiex_sta_init_cmd(priv, false, false);
+ if (ret)
return ERR_PTR(ret);

mwifiex_setup_ht_caps(&wiphy->bands[NL80211_BAND_2GHZ]->ht_cap, priv);

2016-07-02 18:00:42

by Arend Van Spriel

Subject: Re: [patch] mwifiex: fix mwifiex_add_virtual_intf()

On 2-7-2016 9:20, Dan Carpenter wrote:
> We accidentally left some if statements out so the
> mwifiex_add_virtual_intf() function returns early.
>
> Fixes: 7311ea850079 ('mwifiex: fix AP start problem for newly added interface')
> Signed-off-by: Dan Carpenter <[email protected]>

Someone beat you to it [1] ;-)

Regards,
Arend

[1]
http://mid.gmane.org/[email protected]

> diff --git a/drivers/net/wireless/marvell/mwifiex/cfg80211.c b/drivers/net/wireless/marvell/mwifiex/cfg80211.c
> index 99e8cf1..5de9f63 100644
> --- a/drivers/net/wireless/marvell/mwifiex/cfg80211.c
> +++ b/drivers/net/wireless/marvell/mwifiex/cfg80211.c
> @@ -2865,9 +2865,11 @@ struct wireless_dev *mwifiex_add_virtual_intf(struct wiphy *wiphy,
>
> ret = mwifiex_send_cmd(priv, HostCmd_CMD_SET_BSS_MODE,
> HostCmd_ACT_GEN_SET, 0, NULL, true);
> + if (ret)
> return ERR_PTR(ret);
>
> ret = mwifiex_sta_init_cmd(priv, false, false);
> + if (ret)
> return ERR_PTR(ret);
>
> mwifiex_setup_ht_caps(&wiphy->bands[NL80211_BAND_2GHZ]->ht_cap, priv);
> --
> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>