diff --git a/net/mac80211/debugfs_key.c b/net/mac80211/debugfs_key.c index 117f58af5ff9..79ae3552c55b 100644 --- a/net/mac80211/debugfs_key.c +++ b/net/mac80211/debugfs_key.c @@ -4,7 +4,7 @@ * Copyright (c) 2006 Jiri Benc * Copyright 2007 Johannes Berg * Copyright (C) 2015 Intel Deutschland GmbH - * Copyright (C) 2021-2023 Intel Corporation + * Copyright (C) 2021-2023, 2026 Intel Corporation */ #include @@ -42,9 +42,10 @@ static const struct debugfs_short_fops key_ ##name## _ops = { \ KEY_READ_##format(name) \ KEY_OPS(name) -#define KEY_CONF_READ(name, format_string) \ - KEY_READ(conf_##name, conf.name, format_string) -#define KEY_CONF_READ_D(name) KEY_CONF_READ(name, "%d\n") +#define KEY_CONF_READ(name, val, format_string) \ + KEY_READ(conf_##name, conf.val, format_string) +#define KEY_CONF_READ_D(name, val) KEY_CONF_READ(name, val, "%d\n") +#define KEY_CONF_READ_X(name, val) KEY_CONF_READ(name, val, "0x%x\n") #define KEY_CONF_OPS(name) \ static const struct debugfs_short_fops key_ ##name## _ops = { \ @@ -53,12 +54,16 @@ static const struct debugfs_short_fops key_ ##name## _ops = { \ } #define KEY_CONF_FILE(name, format) \ - KEY_CONF_READ_##format(name) \ + KEY_CONF_READ_##format(name, name) \ + KEY_CONF_OPS(name) +#define KEY_CONF_FILE_NAMED(name, val, format) \ + KEY_CONF_READ_##format(name, val) \ KEY_CONF_OPS(name) KEY_CONF_FILE(keylen, D); KEY_CONF_FILE(keyidx, D); KEY_CONF_FILE(hw_key_idx, D); +KEY_CONF_FILE_NAMED(conf_flags, flags, X); KEY_FILE(flags, X); KEY_READ(ifindex, sdata->name, "%s\n"); KEY_OPS(ifindex); @@ -356,6 +361,7 @@ void ieee80211_debugfs_key_add(struct ieee80211_key *key) DEBUGFS_ADD(mic_failures); DEBUGFS_ADD(key); DEBUGFS_ADD(ifindex); + DEBUGFS_ADD(conf_flags); }; void ieee80211_debugfs_key_remove(struct ieee80211_key *key)