[PATCH 4/5] mac80211: tkip.c eliminate the Hi16, Lo16 functions
From: Harvey Harrison <hidden>
Date: 2008-03-19 20:02:37
Subsystem:
mac80211, the rest · Maintainers:
Johannes Berg, Linus Torvalds
Opencode them at their one callsite. Signed-off-by: Harvey Harrison <redacted> --- net/mac80211/tkip.c | 16 ++-------------- 1 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/net/mac80211/tkip.c b/net/mac80211/tkip.c
index d5f8d11..a3dfa67 100644
--- a/net/mac80211/tkip.c
+++ b/net/mac80211/tkip.c@@ -80,18 +80,6 @@ static inline u8 Lo8(u16 v) return v & 0xff; } - -static inline u16 Hi16(u32 v) -{ - return v >> 16; -} - - -static inline u16 Lo16(u32 v) -{ - return v & 0xffff; -} - static inline u16 tkip_S(u16 val) { return tkip_sbox[val & 0xff] ^ swab16(tkip_sbox[val >> 8]);
@@ -108,8 +96,8 @@ static void tkip_mixing_phase1(const u8 *ta, const u8 *tk, u32 tsc_IV32, { int i, j; - p1k[0] = Lo16(tsc_IV32); - p1k[1] = Hi16(tsc_IV32); + p1k[0] = tsc_IV32 & 0xFFFF; + p1k[1] = tsc_IV32 >> 16; p1k[2] = Mk16(ta[1], ta[0]); p1k[3] = Mk16(ta[3], ta[2]); p1k[4] = Mk16(ta[5], ta[4]);
--
1.5.4.4.684.g0e08