mac80211: remove unnecessary key condition

When we reach this point, the key cannot be NULL. Remove the condition
that suggests otherwise.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/20190830112451.21655-6-luca@coelho.fi
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/net/mac80211/key.c b/net/mac80211/key.c
index 7dfee848abac0e7116cc749a0835d1058c8ce9c3..1be3686562ee43675fe52a009f57e00c904f2be2 100644 (file)
--- a/net/mac80211/key.c
+++ b/net/mac80211/key.c
@@ -6,6 +6,7 @@
  * Copyright 2007-2008 Johannes Berg <johannes@sipsolutions.net>
  * Copyright 2013-2014  Intel Mobile Communications GmbH
  * Copyright 2015-2017 Intel Deutschland GmbH
+ * Copyright 2018-2019  Intel Corporation
  */
 
 #include <linux/if_ether.h>
@@ -781,9 +782,8 @@ int ieee80211_key_link(struct ieee80211_key *key,
                /* The rekey code assumes that the old and new key are using
                 * the same cipher. Enforce the assumption for pairwise keys.
                 */
-               if (key &&
-                   ((alt_key && alt_key->conf.cipher != key->conf.cipher) ||
-                    (old_key && old_key->conf.cipher != key->conf.cipher)))
+               if ((alt_key && alt_key->conf.cipher != key->conf.cipher) ||
+                   (old_key && old_key->conf.cipher != key->conf.cipher))
                        goto out;
        } else if (sta) {
                old_key = key_mtx_dereference(sdata->local, sta->gtk[idx]);