| Message ID | 1469961555-2123-1-git-send-email-xypron.glpk@gmx.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 2f69e67058fbe9750a4f66ea30b4b6a8648a2fdc |
| Delegated to: | Kalle Valo |
| Headers | show |
> From: Heinrich Schuchardt [mailto:xypron.glpk@gmx.de] > Sent: Sunday, July 31, 2016 4:09 PM > To: Amitkumar Karwar; Nishant Sarmukadam; Kalle Valo > Cc: linux-wireless@vger.kernel.org; netdev@vger.kernel.org; linux- > kernel@vger.kernel.org; Heinrich Schuchardt > Subject: [PATCH 1/1] mwifiex: remove superfluous condition > > for_each_property_of_node is only executed if the property prop is not > NULL. > > Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> > --- > drivers/net/wireless/marvell/mwifiex/sta_cmd.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/wireless/marvell/mwifiex/sta_cmd.c > b/drivers/net/wireless/marvell/mwifiex/sta_cmd.c > index 7897037..128add8 100644 > --- a/drivers/net/wireless/marvell/mwifiex/sta_cmd.c > +++ b/drivers/net/wireless/marvell/mwifiex/sta_cmd.c > @@ -1482,7 +1482,7 @@ int mwifiex_dnld_dt_cfgdata(struct mwifiex_private > *priv, > continue; > > /* property header is 6 bytes, data must fit in cmd buffer > */ > - if (prop && prop->value && prop->length > 6 && > + if (prop->value && prop->length > 6 && > prop->length <= MWIFIEX_SIZE_OF_CMD_BUFFER - S_DS_GEN) { > ret = mwifiex_send_cmd(priv, HostCmd_CMD_CFG_DATA, > HostCmd_ACT_GEN_SET, 0, Thanks. The patch looks fine to me. Acked-by: Amitkumar Karwar <akarwar@marvell.com> Regards, Amitkumar -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Heinrich Schuchardt <xypron.glpk@gmx.de> wrote: > for_each_property_of_node is only executed if the > property prop is not NULL. > > Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> > Acked-by: Amitkumar Karwar <akarwar@marvell.com> Thanks, 1 patch applied to wireless-drivers-next.git: 2f69e67058fb mwifiex: remove superfluous condition
diff --git a/drivers/net/wireless/marvell/mwifiex/sta_cmd.c b/drivers/net/wireless/marvell/mwifiex/sta_cmd.c index 7897037..128add8 100644 --- a/drivers/net/wireless/marvell/mwifiex/sta_cmd.c +++ b/drivers/net/wireless/marvell/mwifiex/sta_cmd.c @@ -1482,7 +1482,7 @@ int mwifiex_dnld_dt_cfgdata(struct mwifiex_private *priv, continue; /* property header is 6 bytes, data must fit in cmd buffer */ - if (prop && prop->value && prop->length > 6 && + if (prop->value && prop->length > 6 && prop->length <= MWIFIEX_SIZE_OF_CMD_BUFFER - S_DS_GEN) { ret = mwifiex_send_cmd(priv, HostCmd_CMD_CFG_DATA, HostCmd_ACT_GEN_SET, 0,
for_each_property_of_node is only executed if the property prop is not NULL. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> --- drivers/net/wireless/marvell/mwifiex/sta_cmd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)