commit b0f76b335f8b1c324b4b2be06369d391b26a7cc9
author Harvey Harrison <harvey.harrison@gmail.com> Wed May 14 16:26:19 2008 -0700
committer John W. Linville <linville@tuxdriver.com> Wed May 21 21:47:49 2008 -0400
tree 22ecaa2eb8ac0d6df3e35b4cecbca1de74ac63bc
parent a7b6f0c5558ad03281b8064d6a4ab2e124dea991

mac80211: add a struct to hold tkip context

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Cc: "John W. Linville" <linville@tuxdriver.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

net/mac80211/cfg.c

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 3cef80d..dbf0563 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -256,8 +256,8 @@
 	case ALG_TKIP:
 		params.cipher = WLAN_CIPHER_SUITE_TKIP;
 
-		iv32 = key->u.tkip.iv32;
-		iv16 = key->u.tkip.iv16;
+		iv32 = key->u.tkip.tx.iv32;
+		iv16 = key->u.tkip.tx.iv16;
 
 		if (key->flags & KEY_FLAG_UPLOADED_TO_HARDWARE &&
 		    sdata->local->ops->get_tkip_seq)