diff options
| author |   Heinrich Schuchardt <xypron.glpk@gmx.de> | 2016-07-31 14:11:21 +0200 |
|---|---|---|
| committer |   Kalle Valo <kvalo@codeaurora.org> | 2016-09-03 13:00:36 +0300 |
| commit | b0d80f19c14fc5752e806860fe2c702448f5b442 (patch) | |
| tree | 2e743ca113f00e19196dc118fcbbeef6b971f311 /drivers/net/wireless/marvell/mwifiex/sta_cmd.c | |
| parent | mwifiex: remove superfluous condition (diff) | |
| download | linux-dev-b0d80f19c14fc5752e806860fe2c702448f5b442.tar.xz linux-dev-b0d80f19c14fc5752e806860fe2c702448f5b442.zip | |
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>
Acked-by: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Diffstat (limited to 'drivers/net/wireless/marvell/mwifiex/sta_cmd.c')
| -rw-r--r-- | drivers/net/wireless/marvell/mwifiex/sta_cmd.c | 11 |
1 files 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 d1f8011080bc..1d8f2844a878 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); |