From 2158d2f2898db3527c0d6526d5cb450d8865592c Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes@sipsolutions.net>
Date: Tue, 8 Apr 2008 16:46:36 -0400
Subject: [PATCH] --- yaml --- r: 90597 b: refs/heads/master c:
 d9c58f30b08bfe1e689537af5bc855a76d0fae25 h: refs/heads/master i:   90595:
 c11e21d7c1cc328d133304ef9dac660fdeaa1ed6 v: v3

---
 [refs]                           | 2 +-
 trunk/net/mac80211/debugfs_key.c | 3 ++-
 trunk/net/mac80211/key.h         | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 41464da486a6..049e2bc3d30a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cfcdf40e52bdaa7622a9d1de62e5451d3427a5c6
+refs/heads/master: d9c58f30b08bfe1e689537af5bc855a76d0fae25
diff --git a/trunk/net/mac80211/debugfs_key.c b/trunk/net/mac80211/debugfs_key.c
index bf7027e9ce9f..879e7210458a 100644
--- a/trunk/net/mac80211/debugfs_key.c
+++ b/trunk/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/trunk/net/mac80211/key.h b/trunk/net/mac80211/key.h
index 467890c6fe81..5d48518985b3 100644
--- a/trunk/net/mac80211/key.h
+++ b/trunk/net/mac80211/key.h
@@ -125,6 +125,7 @@ struct ieee80211_key {
 		struct dentry *replays;
 		struct dentry *key;
 		struct dentry *ifindex;
+		int cnt;
 	} debugfs;
 #endif