diff options
Diffstat (limited to 'net/mac80211/tkip.c')
-rw-r--r-- | net/mac80211/tkip.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/net/mac80211/tkip.c b/net/mac80211/tkip.c index a7c3febc5a45..8cdf053cb835 100644 --- a/net/mac80211/tkip.c +++ b/net/mac80211/tkip.c | |||
@@ -6,7 +6,6 @@ | |||
6 | * it under the terms of the GNU General Public License version 2 as | 6 | * it under the terms of the GNU General Public License version 2 as |
7 | * published by the Free Software Foundation. | 7 | * published by the Free Software Foundation. |
8 | */ | 8 | */ |
9 | |||
10 | #include <linux/kernel.h> | 9 | #include <linux/kernel.h> |
11 | #include <linux/bitops.h> | 10 | #include <linux/bitops.h> |
12 | #include <linux/types.h> | 11 | #include <linux/types.h> |
@@ -132,7 +131,7 @@ static void tkip_mixing_phase2(const u16 *p1k, const u8 *tk, u16 tsc_IV16, | |||
132 | /* Add TKIP IV and Ext. IV at @pos. @iv0, @iv1, and @iv2 are the first octets | 131 | /* Add TKIP IV and Ext. IV at @pos. @iv0, @iv1, and @iv2 are the first octets |
133 | * of the IV. Returns pointer to the octet following IVs (i.e., beginning of | 132 | * of the IV. Returns pointer to the octet following IVs (i.e., beginning of |
134 | * the packet payload). */ | 133 | * the packet payload). */ |
135 | u8 * ieee80211_tkip_add_iv(u8 *pos, struct ieee80211_key *key, | 134 | u8 *ieee80211_tkip_add_iv(u8 *pos, struct ieee80211_key *key, |
136 | u8 iv0, u8 iv1, u8 iv2) | 135 | u8 iv0, u8 iv1, u8 iv2) |
137 | { | 136 | { |
138 | *pos++ = iv0; | 137 | *pos++ = iv0; |
@@ -143,14 +142,7 @@ u8 * ieee80211_tkip_add_iv(u8 *pos, struct ieee80211_key *key, | |||
143 | return pos + 4; | 142 | return pos + 4; |
144 | } | 143 | } |
145 | 144 | ||
146 | void ieee80211_tkip_gen_phase1key(struct ieee80211_key *key, u8 *ta, | 145 | static void ieee80211_tkip_gen_rc4key(struct ieee80211_key *key, u8 *ta, |
147 | u16 *phase1key) | ||
148 | { | ||
149 | tkip_mixing_phase1(ta, &key->conf.key[ALG_TKIP_TEMP_ENCR_KEY], | ||
150 | key->u.tkip.iv32, phase1key); | ||
151 | } | ||
152 | |||
153 | void ieee80211_tkip_gen_rc4key(struct ieee80211_key *key, u8 *ta, | ||
154 | u8 *rc4key) | 146 | u8 *rc4key) |
155 | { | 147 | { |
156 | /* Calculate per-packet key */ | 148 | /* Calculate per-packet key */ |