diff options
| author | Johannes Berg <johannes@sipsolutions.net> | 2008-04-08 16:46:36 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2008-04-08 16:46:36 -0400 |
| commit | d9c58f30b08bfe1e689537af5bc855a76d0fae25 (patch) | |
| tree | ecd2dde62f9180a2a5736645e9985e33340874e5 | |
| parent | cfcdf40e52bdaa7622a9d1de62e5451d3427a5c6 (diff) | |
mac80211: fix key debugfs default_key link
The default_key symlink points to the key index rather than
they key counter, fix it.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | net/mac80211/debugfs_key.c | 3 | ||||
| -rw-r--r-- | net/mac80211/key.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/net/mac80211/debugfs_key.c b/net/mac80211/debugfs_key.c index bf7027e9ce9f..879e7210458a 100644 --- a/net/mac80211/debugfs_key.c +++ b/net/mac80211/debugfs_key.c | |||
| @@ -195,6 +195,7 @@ void ieee80211_debugfs_key_add(struct ieee80211_key *key) | |||
| 195 | return; | 195 | return; |
| 196 | 196 | ||
| 197 | sprintf(buf, "%d", keycount); | 197 | sprintf(buf, "%d", keycount); |
| 198 | key->debugfs.cnt = keycount; | ||
| 198 | keycount++; | 199 | keycount++; |
| 199 | key->debugfs.dir = debugfs_create_dir(buf, | 200 | key->debugfs.dir = debugfs_create_dir(buf, |
| 200 | key->local->debugfs.keys); | 201 | key->local->debugfs.keys); |
| @@ -258,7 +259,7 @@ void ieee80211_debugfs_key_add_default(struct ieee80211_sub_if_data *sdata) | |||
| 258 | if (!sdata->debugfsdir) | 259 | if (!sdata->debugfsdir) |
| 259 | return; | 260 | return; |
| 260 | 261 | ||
| 261 | sprintf(buf, "../keys/%d", sdata->default_key->conf.keyidx); | 262 | sprintf(buf, "../keys/%d", sdata->default_key->debugfs.cnt); |
| 262 | sdata->debugfs.default_key = | 263 | sdata->debugfs.default_key = |
| 263 | debugfs_create_symlink("default_key", sdata->debugfsdir, buf); | 264 | debugfs_create_symlink("default_key", sdata->debugfsdir, buf); |
| 264 | } | 265 | } |
diff --git a/net/mac80211/key.h b/net/mac80211/key.h index 467890c6fe81..5d48518985b3 100644 --- a/net/mac80211/key.h +++ b/net/mac80211/key.h | |||
| @@ -125,6 +125,7 @@ struct ieee80211_key { | |||
| 125 | struct dentry *replays; | 125 | struct dentry *replays; |
| 126 | struct dentry *key; | 126 | struct dentry *key; |
| 127 | struct dentry *ifindex; | 127 | struct dentry *ifindex; |
| 128 | int cnt; | ||
| 128 | } debugfs; | 129 | } debugfs; |
| 129 | #endif | 130 | #endif |
| 130 | 131 | ||
