From: Johannes Berg <johannes@sipsolutions.net>
Date: Tue, 8 Apr 2008 20:46:36 +0000 (-0400)
Subject: mac80211: fix key debugfs default_key link
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d9c58f30b08bfe1e689537af5bc855a76d0fae25;p=linux-beck.git

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>
---

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)
 		return;
 
 	sprintf(buf, "%d", keycount);
+	key->debugfs.cnt = keycount;
 	keycount++;
 	key->debugfs.dir = debugfs_create_dir(buf,
 					key->local->debugfs.keys);
@@ -258,7 +259,7 @@ void ieee80211_debugfs_key_add_default(struct ieee80211_sub_if_data *sdata)
 	if (!sdata->debugfsdir)
 		return;
 
-	sprintf(buf, "../keys/%d", sdata->default_key->conf.keyidx);
+	sprintf(buf, "../keys/%d", sdata->default_key->debugfs.cnt);
 	sdata->debugfs.default_key =
 		debugfs_create_symlink("default_key", sdata->debugfsdir, buf);
 }
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 {
 		struct dentry *replays;
 		struct dentry *key;
 		struct dentry *ifindex;
+		int cnt;
 	} debugfs;
 #endif