From patchwork Sun Jul 31 10:49:37 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 654346 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3s2K4V2Js4z9syB for ; Sun, 31 Jul 2016 20:50:32 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753408AbcGaKtz (ORCPT ); Sun, 31 Jul 2016 06:49:55 -0400 Received: from mout.gmx.net ([212.227.15.19]:57809 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750748AbcGaKtx (ORCPT ); Sun, 31 Jul 2016 06:49:53 -0400 Received: from LT002.fritz.box ([109.91.48.91]) by mail.gmx.com (mrgmx001) with ESMTPSA (Nemesis) id 0Lg1Tn-1awyLc1Kxf-00pgWC; Sun, 31 Jul 2016 12:49:43 +0200 From: Heinrich Schuchardt 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 (2) Date: Sun, 31 Jul 2016 12:49:37 +0200 Message-Id: <1469962177-2432-1-git-send-email-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.8.1 X-Provags-ID: V03:K0:7rrnwK0Oq2FSIU6bCZ3B1ecI1TzxLlsR72XvML7CkB6oJUXHLQ2 fM1Hiu4qiuE81CIWPL0WUgZ13+fx078esm7iGX2VjplIdTkEzbZpO3b5Wx0oNM4G3rKr+jp +rVGnsU4W5x9B+Ue1pM4cBYYzwP4BqkRcYf88XbPc95YldbvnrqhF5+ywE0cO8mAAAroHeN kK6yjegfm4T1oh7e+gQSg== X-UI-Out-Filterresults: notjunk:1; V01:K0:j/tqm0Zm1XY=:ClwIVWcto2D/fWFwT7Xjcp QEiMzVvccGZSVcO/MtORs3nLIzvT7lCTqrz4ZUxnnQNv1wMCRvSfUj1AC7CaPnmoeWhU+/6VV x5DVQsX6kPCVUJtl27KMLal/DDysor40NmxTMdyDEOfwCbY412o6pSekqvYFJIyWDhLLmQGkl 1OJMuwfUKArjJ2yybIjRK/GYqpVYLSM6lOiyMjYurMyT9TsqOHmWEG7O326GLoaOG5ZLun8vz gvsA7yH4mZjrcWTmwgMTAZw3NpNerynqEFmgmc4hbbA5+f/WOxHSaZ+IyIyljwtM/Ub8BmhKr I0cqUenoybkEZ5NmcAnWh4vsSY8Fci0HcWK/MkQJXyb7SP0O3qSTm/s7dGftTjw569ewMT0V0 9u4zoEq+d9p1CL4gnZFG+w6drgmDdrnpQBMy5Ov8arh41tR2CWOnR8j/5NKuxmDNCIPhvIx+l nA9V+Do4BdR2YA1z6ry+9Vu+zWUmRzaZdyvUIyJjSNHmuQkG4VrDx+2wAKofvN+L5Rd4yry12 ROiJDaBytf0/RxdYm/xY/I/AF5Y06DuDiogRl9mSEItp2gGFKlh+r/UBmzNZ3aABd42EMnsvF I4KLwAGFznISQa/IKIR9YsqJz6soF/RCVpjCqZpjysPVhbLLjLtQ7giGuDdEA0R8C3mOgsX0P Q5/fBqYtgLvAAptzmKzx1ZbxtJgQDqJlHGiQXOKkKigBeAzEyWCvw0POWFKHl4i5D856Vptwo WNGW8+/oPRO/56HYTpLYJWiU1PMi4RfeKFtzQrsnW/kcImrPxdtXgz45ac4= Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- 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);