From be74a615a70245a5fb44af41be62e262436e5f06 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes@sipsolutions.net>
Date: Tue, 28 Aug 2007 17:01:55 -0400
Subject: [PATCH] --- yaml --- r: 66362 b: refs/heads/master c:
 e7a64f12a452d39ab50e5580e93bc48b3b15f30c h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 07da5de21c91..386a86e7c96d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 11a843b7e16062389c53ba393c7913956e034eb2
+refs/heads/master: e7a64f12a452d39ab50e5580e93bc48b3b15f30c
diff --git a/trunk/net/mac80211/debugfs_key.c b/trunk/net/mac80211/debugfs_key.c
index 36e7812da556..8e4a1bcd16ea 100644
--- a/trunk/net/mac80211/debugfs_key.c
+++ b/trunk/net/mac80211/debugfs_key.c
@@ -56,6 +56,8 @@ KEY_CONF_FILE(keyidx, D);
 KEY_CONF_FILE(hw_key_idx, D);
 KEY_FILE(flags, X);
 KEY_FILE(tx_rx_count, D);
+KEY_READ(ifindex, sdata->dev->ifindex, 20, "%d\n");
+KEY_OPS(ifindex);
 
 static ssize_t key_algorithm_read(struct file *file,
 				  char __user *userbuf,
@@ -209,6 +211,7 @@ void ieee80211_debugfs_key_add(struct ieee80211_local *local,
 	DEBUGFS_ADD(rx_spec);
 	DEBUGFS_ADD(replays);
 	DEBUGFS_ADD(key);
+	DEBUGFS_ADD(ifindex);
 };
 
 #define DEBUGFS_DEL(name) \
@@ -229,6 +232,7 @@ void ieee80211_debugfs_key_remove(struct ieee80211_key *key)
 	DEBUGFS_DEL(rx_spec);
 	DEBUGFS_DEL(replays);
 	DEBUGFS_DEL(key);
+	DEBUGFS_DEL(ifindex);
 
 	debugfs_remove(key->debugfs.stalink);
 	key->debugfs.stalink = NULL;
diff --git a/trunk/net/mac80211/ieee80211_key.h b/trunk/net/mac80211/ieee80211_key.h
index a4e5fbbe045c..ae49418f18b4 100644
--- a/trunk/net/mac80211/ieee80211_key.h
+++ b/trunk/net/mac80211/ieee80211_key.h
@@ -101,6 +101,7 @@ struct ieee80211_key {
 		struct dentry *rx_spec;
 		struct dentry *replays;
 		struct dentry *key;
+		struct dentry *ifindex;
 	} debugfs;
 #endif