From e946912df5eee20c3aaecf5efe8a0eca24a807c3 Mon Sep 17 00:00:00 2001
From: Ivo van Doorn <ivdoorn@gmail.com>
Date: Thu, 17 Apr 2008 21:11:18 +0200
Subject: [PATCH] --- yaml --- r: 102440 b: refs/heads/master c:
 c6adbd2158fee972adcc6232de5e2ef375f1f782 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/include/net/mac80211.h | 3 +++
 trunk/net/mac80211/key.c     | 7 +++++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d7f3e4441b59..13d596ba7cb8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 988c0f723d0b1abb399e6e71d8bf3f8bf1949a70
+refs/heads/master: c6adbd2158fee972adcc6232de5e2ef375f1f782
diff --git a/trunk/include/net/mac80211.h b/trunk/include/net/mac80211.h
index 27ef9f761ac5..740c11ca066c 100644
--- a/trunk/include/net/mac80211.h
+++ b/trunk/include/net/mac80211.h
@@ -621,11 +621,14 @@ enum ieee80211_key_alg {
  * @IEEE80211_KEY_FLAG_GENERATE_MMIC: This flag should be set by
  *	the driver for a TKIP key if it requires Michael MIC
  *	generation in software.
+ * @IEEE80211_KEY_FLAG_PAIRWISE: Set by mac80211, this flag indicates
+ *	that the key is pairwise rather then a shared key.
  */
 enum ieee80211_key_flags {
 	IEEE80211_KEY_FLAG_WMM_STA	= 1<<0,
 	IEEE80211_KEY_FLAG_GENERATE_IV	= 1<<1,
 	IEEE80211_KEY_FLAG_GENERATE_MMIC= 1<<2,
+	IEEE80211_KEY_FLAG_PAIRWISE	= 1<<3,
 };
 
 /**
diff --git a/trunk/net/mac80211/key.c b/trunk/net/mac80211/key.c
index 150d66dbda9d..88b211af7c1f 100644
--- a/trunk/net/mac80211/key.c
+++ b/trunk/net/mac80211/key.c
@@ -323,6 +323,13 @@ void ieee80211_key_link(struct ieee80211_key *key,
 		 */
 		if (sta->flags & WLAN_STA_WME)
 			key->conf.flags |= IEEE80211_KEY_FLAG_WMM_STA;
+
+		/*
+		 * This key is for a specific sta interface,
+		 * inform the driver that it should try to store
+		 * this key as pairwise key.
+		 */
+		key->conf.flags |= IEEE80211_KEY_FLAG_PAIRWISE;
 	} else {
 		if (sdata->vif.type == IEEE80211_IF_TYPE_STA) {
 			struct sta_info *ap;