| Message ID | 1504816363-31015-1-git-send-email-gbhat@marvell.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 26177d7f3969da1827bc2b5923edcfc2ff4c3a61 |
| Delegated to: | Kalle Valo |
| Headers | show |
Hi, Could have used a 'v2' in the subject, but hopefully that doesn't bother Kalle too much. On Fri, Sep 08, 2017 at 02:02:43AM +0530, Ganapathi Bhat wrote: > If driver is loaded with 'mfg_mode' enabled, then the sending > commands are not allowed. So, skip sending commands, to firmware > in mwifiex_add_virtual_intf if 'mfg_mode' is enabled. > > Fixes: 7311ea850079 ("mwifiex: fix AP start problem for newly added interface") > Signed-off-by: Ganapathi Bhat <gbhat@marvell.com> > --- > v2: addressed Brian's comments. > --- > drivers/net/wireless/marvell/mwifiex/cfg80211.c | 19 +++++++++++-------- > 1 file changed, 11 insertions(+), 8 deletions(-) > > diff --git a/drivers/net/wireless/marvell/mwifiex/cfg80211.c b/drivers/net/wireless/marvell/mwifiex/cfg80211.c > index 32c5074..ad1ebd8 100644 > --- a/drivers/net/wireless/marvell/mwifiex/cfg80211.c > +++ b/drivers/net/wireless/marvell/mwifiex/cfg80211.c > @@ -2959,18 +2959,21 @@ struct wireless_dev *mwifiex_add_virtual_intf(struct wiphy *wiphy, > } > > mwifiex_init_priv_params(priv, dev); > - mwifiex_set_mac_address(priv, dev); > > priv->netdev = dev; > > - ret = mwifiex_send_cmd(priv, HostCmd_CMD_SET_BSS_MODE, > - HostCmd_ACT_GEN_SET, 0, NULL, true); > - if (ret) > - goto err_set_bss_mode; > + if (!adapter->mfg_mode) { > + mwifiex_set_mac_address(priv, dev); > > - ret = mwifiex_sta_init_cmd(priv, false, false); > - if (ret) > - goto err_sta_init; > + ret = mwifiex_send_cmd(priv, HostCmd_CMD_SET_BSS_MODE, > + HostCmd_ACT_GEN_SET, 0, NULL, true); > + if (ret) > + goto err_set_bss_mode; > + > + ret = mwifiex_sta_init_cmd(priv, false, false); > + if (ret) > + goto err_sta_init; > + } Seems better to me. Reviewed-by: Brian Norris <briannorris@chromium.org> > > mwifiex_setup_ht_caps(&wiphy->bands[NL80211_BAND_2GHZ]->ht_cap, priv); > if (adapter->is_hw_11ac_capable) > -- > 1.9.1 >
Brian Norris <briannorris@chromium.org> writes: > Could have used a 'v2' in the subject, but hopefully that doesn't bother > Kalle too much. It does create more work for me when sorting patches so please always try include the version in the subject. But no need to resend.
Hi Kalle, > -----Original Message----- > From: Kalle Valo [mailto:kvalo@codeaurora.org] > Sent: Tuesday, September 12, 2017 11:33 AM > To: Brian Norris > Cc: Ganapathi Bhat; linux-wireless@vger.kernel.org; Cathy Luo; Xinming > Hu; Zhiyuan Yang; James Cao; Mangesh Malusare > Subject: [EXT] Re: [PATCH] mwifiex: check for mfg_mode in > add_virtual_intf > > External Email > > ---------------------------------------------------------------------- > Brian Norris <briannorris@chromium.org> writes: > > > Could have used a 'v2' in the subject, but hopefully that doesn't > > bother Kalle too much. > > It does create more work for me when sorting patches so please always > try include the version in the subject. But no need to resend. Sure. I will keep this in mind for future submits. > > -- > Kalle Valo Thanks, Ganapathi
Ganapathi Bhat <gbhat@marvell.com> wrote: > If driver is loaded with 'mfg_mode' enabled, then the sending > commands are not allowed. So, skip sending commands, to firmware > in mwifiex_add_virtual_intf if 'mfg_mode' is enabled. > > Fixes: 7311ea850079 ("mwifiex: fix AP start problem for newly added interface") > Signed-off-by: Ganapathi Bhat <gbhat@marvell.com> > Reviewed-by: Brian Norris <briannorris@chromium.org> Patch applied to wireless-drivers-next.git, thanks. 26177d7f3969 mwifiex: check for mfg_mode in add_virtual_intf
diff --git a/drivers/net/wireless/marvell/mwifiex/cfg80211.c b/drivers/net/wireless/marvell/mwifiex/cfg80211.c index 32c5074..ad1ebd8 100644 --- a/drivers/net/wireless/marvell/mwifiex/cfg80211.c +++ b/drivers/net/wireless/marvell/mwifiex/cfg80211.c @@ -2959,18 +2959,21 @@ struct wireless_dev *mwifiex_add_virtual_intf(struct wiphy *wiphy, } mwifiex_init_priv_params(priv, dev); - mwifiex_set_mac_address(priv, dev); priv->netdev = dev; - ret = mwifiex_send_cmd(priv, HostCmd_CMD_SET_BSS_MODE, - HostCmd_ACT_GEN_SET, 0, NULL, true); - if (ret) - goto err_set_bss_mode; + if (!adapter->mfg_mode) { + mwifiex_set_mac_address(priv, dev); - ret = mwifiex_sta_init_cmd(priv, false, false); - if (ret) - goto err_sta_init; + ret = mwifiex_send_cmd(priv, HostCmd_CMD_SET_BSS_MODE, + HostCmd_ACT_GEN_SET, 0, NULL, true); + if (ret) + goto err_set_bss_mode; + + ret = mwifiex_sta_init_cmd(priv, false, false); + if (ret) + goto err_sta_init; + } mwifiex_setup_ht_caps(&wiphy->bands[NL80211_BAND_2GHZ]->ht_cap, priv); if (adapter->is_hw_11ac_capable)
If driver is loaded with 'mfg_mode' enabled, then the sending commands are not allowed. So, skip sending commands, to firmware in mwifiex_add_virtual_intf if 'mfg_mode' is enabled. Fixes: 7311ea850079 ("mwifiex: fix AP start problem for newly added interface") Signed-off-by: Ganapathi Bhat <gbhat@marvell.com> --- v2: addressed Brian's comments. --- drivers/net/wireless/marvell/mwifiex/cfg80211.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-)