Skip to contentSkip to conversation

mac80211: tkip.c remove unused function, make function static

PATCH New Harvey Harrison 1 participant 1 message Mar 19, 2008 mac80211

lore
Share & tools
lore

Harvey Harrison

author
#0 lore raw

PATCH 2/5 mac80211: tkip.c remove unused function, make function static

make static void ieee80211_tkip_gen_rc4key static
remove the unused ieee80211_tkip_gen_phase1key

Signed-off-by Harvey Harrison <[email protected]>
---
 net/mac80211/tkip.c |   10 +---------
 net/mac80211/tkip.h |    4 ----
 2 files changed, 1 insertions(+), 13 deletions(-)
net/mac80211/tkip.c +1 -9
index a5745c1..f4b0c85 100644
@@ -184,15 +184,7 @@ u8 * ieee80211_tkip_add_iv(u8 *pos, struct ieee80211_key *key,
 	return pos;
 }
 
-
-void ieee80211_tkip_gen_phase1key(struct ieee80211_key *key, u8 *ta,
-				  u16 *phase1key)
-{
-	tkip_mixing_phase1(ta, &key->conf.key[ALG_TKIP_TEMP_ENCR_KEY],
-			   key->u.tkip.iv32, phase1key);
-}
-
-void ieee80211_tkip_gen_rc4key(struct ieee80211_key *key, u8 *ta,
+static void ieee80211_tkip_gen_rc4key(struct ieee80211_key *key, u8 *ta,
 			       u8 *rc4key)
 {
 	/* Calculate per-packet key */
net/mac80211/tkip.h +0 -4
index 73d8ef2..944d5fa 100644
@@ -15,10 +15,6 @@
 
 u8 * ieee80211_tkip_add_iv(u8 *pos, struct ieee80211_key *key,
 			   u8 iv0, u8 iv1, u8 iv2);
-void ieee80211_tkip_gen_phase1key(struct ieee80211_key *key, u8 *ta,
-				  u16 *phase1key);
-void ieee80211_tkip_gen_rc4key(struct ieee80211_key *key, u8 *ta,
-			       u8 *rc4key);
 void ieee80211_tkip_encrypt_data(struct crypto_blkcipher *tfm,
 				 struct ieee80211_key *key,
 				 u8 *pos, size_t payload_len, u8 *ta);
Signature · 1 line
1.5.4.4.684.g0e08