Skip to content

Commit

Permalink
wifi: mac80211: mark keys as uploaded when added by the driver
Browse files Browse the repository at this point in the history
When the driver has some form of GTK rekeying offload, e.g. during
WoWLAN, mac80211 can assume that keys that the driver adds for
that are already present in the hardware acceleration. Mark them
accordingly.

Signed-off-by: Yedidya Benshimol <yedidya.ben.shimol@intel.com>
Signed-off-by: Gregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20230621144414.bc78c7ff2a3d.I5e313d69e2b6a7a4766ef82d0faa122dd4c1c46d@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
  • Loading branch information
Yedidya Benshimol authored and Johannes Berg committed Jun 21, 2023
1 parent fd006d6 commit f52a0b4
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions net/mac80211/key.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +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-2020, 2022 Intel Corporation
* Copyright 2018-2020, 2022-2023 Intel Corporation
*/

#include <linux/if_ether.h>
Expand Down Expand Up @@ -510,8 +510,12 @@ static int ieee80211_key_replace(struct ieee80211_sub_if_data *sdata,
ret = ieee80211_key_enable_hw_accel(new);
}
} else {
if (!new->local->wowlan)
if (!new->local->wowlan) {
ret = ieee80211_key_enable_hw_accel(new);
} else {
assert_key_lock(new->local);
new->flags |= KEY_FLAG_UPLOADED_TO_HARDWARE;
}
}

if (ret)
Expand Down

0 comments on commit f52a0b4

Please sign in to comment.