[PATCH 2/5] tkip: remove unused function, other cleanups

[PATCH 2/5] tkip: remove unused function, other cleanups

[Harvey Harrison]

tkip_S had an opencoded swab16
make ieee80211_tkip_gen_rc4key() static
remove the unused ieee80211_tkip_gen_phase1key()

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
---
 net/mac80211/tkip.c |   18 +++---------------
 net/mac80211/tkip.h |    4 ----
 2 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/net/mac80211/tkip.c b/net/mac80211/tkip.c
index 229b4b4..90c11e7 100644
--- a/net/mac80211/tkip.c
+++ b/net/mac80211/tkip.c
@@ -90,11 +90,9 @@ static inline u16 Lo16(u32 v)
 	return v & 0xffff;
 }
 
-static inline u16 tkip_S(u16 val)
+static u16 tkip_S(u16 val)
 {
-	u16 a = tkip_sbox[Hi8(val)];
-
-	return tkip_sbox[Lo8(val)] ^ Hi8(a) ^ (Lo8(a) << 8);
+	return tkip_sbox[val & 0xff] ^ swab16(tkip_sbox[val >> 8]);
 }
 

@@ -182,15 +180,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 */
@@ -337,5 +327,3 @@ int ieee80211_tkip_decrypt_data(struct crypto_blkcipher *tfm,
 
 	return res;
 }
-
-
diff --git a/net/mac80211/tkip.h b/net/mac80211/tkip.h
index 73d8ef2..944d5fa 100644
--- a/net/mac80211/tkip.h
+++ b/net/mac80211/tkip.h
@@ -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);
-- 
1.5.4.GIT

Re: [PATCH 2/5] tkip: remove unused function, other cleanups

[Johannes Berg]

[-- Attachment #1: Type: text/plain, Size: 245 bytes --]


On Sat, 2008-03-08 at 01:23 -0800, Harvey Harrison wrote:
> tkip_S had an opencoded swab16
> make ieee80211_tkip_gen_rc4key() static
> remove the unused ieee80211_tkip_gen_phase1key()

This seems fine. Does it depend on 1/5?

johannes

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 828 bytes --]