diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index e46944500cfa1cadb0e1319616c4d89560aa9f74..2201923238edc2e9344e213096a97fea121d8ffe 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -457,6 +457,9 @@ static int ieee80211_add_key(struct wiphy *wiphy, struct net_device *dev,
 		sta->cipher_scheme = cs;
 
 	err = ieee80211_key_link(key, sdata, sta);
+	/* KRACK protection, shouldn't happen but just silently accept key */
+	if (err == -EALREADY)
+		err = 0;
 
  out_unlock:
 	mutex_unlock(&local->sta_mtx);
diff --git a/net/mac80211/key.c b/net/mac80211/key.c
index 6775d6cb7d3d4d0f31de0f78a92549d1d86dd3ce..017a9d2b5cece5ee16ca044db1021656e6e45cbb 100644
--- a/net/mac80211/key.c
+++ b/net/mac80211/key.c
@@ -681,7 +681,7 @@ int ieee80211_key_link(struct ieee80211_key *key,
 	 */
 	if (ieee80211_key_identical(sdata, old_key, key)) {
 		ieee80211_key_free_unused(key);
-		ret = 0;
+		ret = -EALREADY;
 		goto out;
 	}