| Message ID | 1469967081-3937-1-git-send-email-xypron.glpk@gmx.de |
|---|---|
| State | Awaiting Upstream, archived |
| Delegated to: | David Miller |
| Headers | show |
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(-)