From: Harvey Harrison <harvey.harrison@xxxxxxxxx>
Opencode them at their one callsite.
Signed-off-by: Harvey Harrison <harvey.harrison@xxxxxxxxx>
Cc: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Cc: John W. Linville <linville@xxxxxxxxxxxxx>
Cc: Joe Perches <joe@xxxxxxxxxxx>
Cc: Jiri Benc <jbenc@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
net/mac80211/tkip.c | 16 ++--------------
1 file changed, 2 insertions(+), 14 deletions(-)
diff -puN net/mac80211/tkip.c~mac80211-tkipc-eliminate-the-hi16-lo16-functions net/mac80211/tkip.c
--- a/net/mac80211/tkip.c~mac80211-tkipc-eliminate-the-hi16-lo16-functions
+++ a/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
{
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]);
_
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
