From 774efcb37a1c87cdca7e1305e72c80c04c0527e1 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes@sipsolutions.net>
Date: Mon, 25 Jan 2010 11:36:16 +0100
Subject: [PATCH] --- yaml --- r: 183907 b: refs/heads/master c:
 382b16559d599c4260aeb82a5ea5ba44459d1cd2 h: refs/heads/master i:   183905:
 b4bbc758b5a0939a6a765cce3eb36e3657177bd9   183903:
 c864ec11067d1baa75eb6d9044764557d028786b v: v3

---
 [refs]                  | 2 +-
 trunk/net/mac80211/tx.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 6f8c57fc250e..ede9ccebf764 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1396b231b0369c4146988c2f42fb416ae19e2572
+refs/heads/master: 382b16559d599c4260aeb82a5ea5ba44459d1cd2
diff --git a/trunk/net/mac80211/tx.c b/trunk/net/mac80211/tx.c
index d017b3530d4d..14c70452c245 100644
--- a/trunk/net/mac80211/tx.c
+++ b/trunk/net/mac80211/tx.c
@@ -559,7 +559,7 @@ ieee80211_tx_h_select_key(struct ieee80211_tx_data *tx)
 		}
 
 		if (!skip_hw && tx->key &&
-		    tx->key->conf.flags & KEY_FLAG_UPLOADED_TO_HARDWARE)
+		    tx->key->flags & KEY_FLAG_UPLOADED_TO_HARDWARE)
 			info->control.hw_key = &tx->key->conf;
 	}