[PATCH 1/1] mwifiex: remove superfluous condition (2)

From	Heinrich Schuchardt <xypron.glpk@gmx.de>
Newsgroups	linux.kernel
Subject	[PATCH 1/1] mwifiex: remove superfluous condition (2)
Date	2016-07-31 13:00 +0200
Message-ID	<s0WDn-7rm-9@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

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

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH 1/1] mwifiex: remove superfluous condition (2) Heinrich Schuchardt <xypron.glpk@gmx.de> - 2016-07-31 13:00 +0200
  Re: [PATCH 1/1] mwifiex: remove superfluous condition (2) Kalle Valo <kvalo@codeaurora.org> - 2016-07-31 14:10 +0200
    [PATCH 1/1] mwifiex: key_material_v2 remove superfluous condition Heinrich Schuchardt <xypron.glpk@gmx.de> - 2016-07-31 14:20 +0200
      RE: [PATCH 1/1] mwifiex: key_material_v2 remove superfluous condition Amitkumar Karwar <akarwar@marvell.com> - 2016-08-01 12:50 +0200

csiph-web