akpm@xxxxxxxxxxxxxxxxxxxx wrote:
From: Harvey Harrison <harvey.harrison@xxxxxxxxx>
Rather than open-coding the get/put of little endian values, use
get/put_unaligned and the byteorder helpers.
Signed-off-by: Harvey Harrison <harvey.harrison@xxxxxxxxx>
Cc: Jiri Benc <jbenc@xxxxxxx>
Cc: John W. Linville <linville@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
net/mac80211/michael.c | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff -puN net/mac80211/michael.c~mac80211-michaelc-use-unaligned-byteorder-helpers net/mac80211/michael.c
--- a/net/mac80211/michael.c~mac80211-michaelc-use-unaligned-byteorder-helpers
+++ a/net/mac80211/michael.c
@@ -9,6 +9,8 @@
#include <linux/types.h>
#include <linux/bitops.h>
+#include <asm/byteorder.h>
+#include <asm/unaligned.h>
#include "michael.h"
@@ -24,21 +26,20 @@ static void michael_block(u32 *l, u32 *r
*l += *r;
}
-
-static inline u32 michael_get32(u8 *data)
+static u32 michael_get16(u8 *data)
{
- return data[0] | (data[1] << 8) | (data[2] << 16) | (data[3] << 24);
+ return le16_to_cpu(get_unaligned((__le16 *)data));
}
-
-static inline void michael_put32(u32 val, u8 *data)
+static u32 michael_get32(u8 *data)
{
- data[0] = val & 0xff;
- data[1] = (val >> 8) & 0xff;
- data[2] = (val >> 16) & 0xff;
- data[3] = (val >> 24) & 0xff;
+ return le32_to_cpu(get_unaligned((__le32 *)data));
}
+static void michael_put32(u32 val, u8 *data)
+{
+ put_unaligned(cpu_to_le32(val), (__le32 *)data);
+}
void michael_mic(u8 *key, u8 *da, u8 *sa, u8 priority,
u8 *data, size_t data_len, u8 *mic)
@@ -53,7 +54,7 @@ void michael_mic(u8 *key, u8 *da, u8 *sa
* calculation, but it is _not_ transmitted */
l ^= michael_get32(da);
michael_block(&l, &r);
- l ^= da[4] | (da[5] << 8) | (sa[0] << 16) | (sa[1] << 24);
+ l ^= michael_get16(da) | (michael_get16(sa) << 16);
___________________________^^
This should be da + 4! This change affects #7 of 7, and is needed
there as well. With those changes, my stuff works with patches 1-6 and
with 1-7.
Larry
--
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
