Opencode the Hi8/Lo8 and eliminate the temporary variable in
tkip_S().
Signed-off-by: Harvey Harrison <[email protected]>
---
net/mac80211/tkip.c | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/net/mac80211/tkip.c b/net/mac80211/tkip.c
index f4b0c85..d5f8d11 100644
--- a/net/mac80211/tkip.c
+++ b/net/mac80211/tkip.c
@@ -94,13 +94,9 @@ static inline u16 Lo16(u32 v)
static inline 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]);
}
-
-
/* P1K := Phase1(TA, TK, TSC)
* TA = transmitter address (48 bits)
* TK = dot11DefaultKeyValue or dot11KeyMappingValue (128 bits)
--
1.5.4.4.684.g0e08