Pull thermal into release branch

[pandora-kernel.git] / net / bridge / br_input.c

diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c
index 420bbb9..5c18595 100644 (file)
--- a/net/bridge/br_input.c
+++ b/net/bridge/br_input.c
@@ -112,9 +112,9 @@ static int br_handle_local_finish(struct sk_buff *skb)
  */
 static inline int is_link_local(const unsigned char *dest)
 {
-       const u16 *a = (const u16 *) dest;
-       static const u16 *const b = (const u16 *const ) br_group_address;
-       static const u16 m = __constant_cpu_to_be16(0xfff0);
+       __be16 *a = (__be16 *)dest;
+       static const __be16 *b = (const __be16 *)br_group_address;
+       static const __be16 m = __constant_cpu_to_be16(0xfff0);
 
        return ((a[0] ^ b[0]) | (a[1] ^ b[1]) | ((a[2] ^ b[2]) & m)) == 0;
 }