| Message ID | 1469967081-3937-1-git-send-email-xypron.glpk@gmx.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | b0d80f19c14fc5752e806860fe2c702448f5b442 |
| Delegated to: | Kalle Valo |
| Headers | show |
> From: Heinrich Schuchardt [mailto:xypron.glpk@gmx.de] > Sent: Sunday, July 31, 2016 5:41 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: key_material_v2 remove superfluous > condition > > We are using mac as source address in a memcpy. > In the lines below we can assume mac is not NULL. > > Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> > --- > drivers/net/wireless/marvell/mwifiex/sta_cmd.c | 11 +++-------- > 1 file changed, 3 insertions(+), 8 deletions(-) > > diff --git a/drivers/net/wireless/marvell/mwifiex/sta_cmd.c > b/drivers/net/wireless/marvell/mwifiex/sta_cmd.c > index 128add8..0d4f9fe 100644 > --- a/drivers/net/wireless/marvell/mwifiex/sta_cmd.c > +++ b/drivers/net/wireless/marvell/mwifiex/sta_cmd.c > @@ -706,15 +706,10 @@ mwifiex_cmd_802_11_key_material_v2(struct > mwifiex_private *priv, > (priv->wep_key_curr_index & KEY_INDEX_MASK)) > key_info |= KEY_DEFAULT; > } else { > - if (mac) { > - if (is_broadcast_ether_addr(mac)) > - key_info |= KEY_MCAST; > - else > - key_info |= KEY_UNICAST | > - KEY_DEFAULT; > - } else { > + if (is_broadcast_ether_addr(mac)) > key_info |= KEY_MCAST; > - } > + else > + key_info |= KEY_UNICAST | KEY_DEFAULT; > } > } > km->key_param_set.key_info = cpu_to_le16(key_info); > -- > 2.8.1 Looks ok 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: > We are using mac as source address in a memcpy. > In the lines below we can assume mac 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: b0d80f19c14f mwifiex: key_material_v2 remove superfluous condition
diff --git a/drivers/net/wireless/marvell/mwifiex/sta_cmd.c b/drivers/net/wireless/marvell/mwifiex/sta_cmd.c index 128add8..0d4f9fe 100644 --- a/drivers/net/wireless/marvell/mwifiex/sta_cmd.c +++ b/drivers/net/wireless/marvell/mwifiex/sta_cmd.c @@ -706,15 +706,10 @@ mwifiex_cmd_802_11_key_material_v2(struct mwifiex_private *priv, (priv->wep_key_curr_index & KEY_INDEX_MASK)) key_info |= KEY_DEFAULT; } else { - if (mac) { - if (is_broadcast_ether_addr(mac)) - key_info |= KEY_MCAST; - else - key_info |= KEY_UNICAST | - KEY_DEFAULT; - } else { + if (is_broadcast_ether_addr(mac)) key_info |= KEY_MCAST; - } + else + key_info |= KEY_UNICAST | KEY_DEFAULT; } } km->key_param_set.key_info = cpu_to_le16(key_info);
We are using mac as source address in a memcpy. In the lines below we can assume mac is not NULL. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> --- drivers/net/wireless/marvell/mwifiex/sta_cmd.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)