3 files changed, 22 insertions, 21 deletions

diff --git a/net/bluetooth/bnep/bnep.h b/net/bluetooth/bnep/bnep.h
index bbb1ed7097a9..0b6cd0e2528d 100644
--- a/net/bluetooth/bnep/bnep.h
+++ b/net/bluetooth/bnep/bnep.h
@@ -95,14 +95,14 @@ struct bnep_setup_conn_req {
 struct bnep_set_filter_req {
         __u8  type;
         __u8  ctrl;
-        __u16 len;
+        __be16 len;
         __u8  list[0];
 } __attribute__((packed));
 
 struct bnep_control_rsp {
         __u8  type;
         __u8  ctrl;
-        __u16 resp;
+        __be16 resp;
 } __attribute__((packed));
 
 struct bnep_ext_hdr {
diff --git a/net/bluetooth/bnep/core.c b/net/bluetooth/bnep/core.c
index 4d3424c2421c..7ba6470dc507 100644
--- a/net/bluetooth/bnep/core.c
+++ b/net/bluetooth/bnep/core.c
@@ -117,18 +117,18 @@ static int bnep_send_rsp(struct bnep_session *s, u8 ctrl, u16 resp)
 static inline void bnep_set_default_proto_filter(struct bnep_session *s)
 {
         /* (IPv4, ARP)  */
-        s->proto_filter[0].start = htons(0x0800);
-        s->proto_filter[0].end   = htons(0x0806);
+        s->proto_filter[0].start = ETH_P_IP;
+        s->proto_filter[0].end   = ETH_P_ARP;
         /* (RARP, AppleTalk) */
-        s->proto_filter[1].start = htons(0x8035);
-        s->proto_filter[1].end   = htons(0x80F3);
+        s->proto_filter[1].start = ETH_P_RARP;
+        s->proto_filter[1].end   = ETH_P_AARP;
         /* (IPX, IPv6) */
-        s->proto_filter[2].start = htons(0x8137);
-        s->proto_filter[2].end   = htons(0x86DD);
+        s->proto_filter[2].start = ETH_P_IPX;
+        s->proto_filter[2].end   = ETH_P_IPV6;
 }
 #endif
 
-static int bnep_ctrl_set_netfilter(struct bnep_session *s, u16 *data, int len)
+static int bnep_ctrl_set_netfilter(struct bnep_session *s, __be16 *data, int len)
 {
         int n;
 
@@ -150,8 +150,8 @@ static int bnep_ctrl_set_netfilter(struct bnep_session *s, u16 *data, int len)
                 int i;
 
                 for (i = 0; i < n; i++) {
-                        f[i].start = get_unaligned(data++);
-                        f[i].end   = get_unaligned(data++);
+                        f[i].start = ntohs(get_unaligned(data++));
+                        f[i].end   = ntohs(get_unaligned(data++));
 
                         BT_DBG("proto filter start %d end %d",
                                 f[i].start, f[i].end);
@@ -180,7 +180,7 @@ static int bnep_ctrl_set_mcfilter(struct bnep_session *s, u8 *data, int len)
         if (len < 2)
                 return -EILSEQ;
 
-        n = ntohs(get_unaligned((u16 *) data)); 
+        n = ntohs(get_unaligned((__be16 *) data));
         data += 2; len -= 2;
 
         if (len < n)
@@ -332,7 +332,7 @@ static inline int bnep_rx_frame(struct bnep_session *s, struct sk_buff *skb)
         if (!skb_pull(skb, __bnep_rx_hlen[type & BNEP_TYPE_MASK]))
                 goto badframe;
 
-        s->eh.h_proto = get_unaligned((u16 *) (skb->data - 2));
+        s->eh.h_proto = get_unaligned((__be16 *) (skb->data - 2));
 
         if (type & BNEP_EXT_HEADER) {
                 if (bnep_rx_extension(s, skb) < 0)
@@ -343,7 +343,7 @@ static inline int bnep_rx_frame(struct bnep_session *s, struct sk_buff *skb)
         if (ntohs(s->eh.h_proto) == 0x8100) {
                 if (!skb_pull(skb, 4))
                         goto badframe;
-                s->eh.h_proto = get_unaligned((u16 *) (skb->data - 2));
+                s->eh.h_proto = get_unaligned((__be16 *) (skb->data - 2));
         }
         
         /* We have to alloc new skb and copy data here :(. Because original skb
@@ -365,7 +365,7 @@ static inline int bnep_rx_frame(struct bnep_session *s, struct sk_buff *skb)
         case BNEP_COMPRESSED_SRC_ONLY:
                 memcpy(__skb_put(nskb, ETH_ALEN), s->eh.h_dest, ETH_ALEN);
                 memcpy(__skb_put(nskb, ETH_ALEN), skb->mac.raw, ETH_ALEN);
-                put_unaligned(s->eh.h_proto, (u16 *) __skb_put(nskb, 2));
+                put_unaligned(s->eh.h_proto, (__be16 *) __skb_put(nskb, 2));
                 break;
 
         case BNEP_COMPRESSED_DST_ONLY:
@@ -375,7 +375,7 @@ static inline int bnep_rx_frame(struct bnep_session *s, struct sk_buff *skb)
 
         case BNEP_GENERAL:
                 memcpy(__skb_put(nskb, ETH_ALEN * 2), skb->mac.raw, ETH_ALEN * 2);
-                put_unaligned(s->eh.h_proto, (u16 *) __skb_put(nskb, 2));
+                put_unaligned(s->eh.h_proto, (__be16 *) __skb_put(nskb, 2));
                 break;
         }
 
diff --git a/net/bluetooth/bnep/netdev.c b/net/bluetooth/bnep/netdev.c
index 7f7b27db6a8f..67a002a9751a 100644
--- a/net/bluetooth/bnep/netdev.c
+++ b/net/bluetooth/bnep/netdev.c
@@ -158,14 +158,15 @@ static inline int bnep_net_mc_filter(struct sk_buff *skb, struct bnep_session *s
 static inline u16 bnep_net_eth_proto(struct sk_buff *skb)
 {
         struct ethhdr *eh = (void *) skb->data;
+        u16 proto = ntohs(eh->h_proto);
         
-        if (ntohs(eh->h_proto) >= 1536)
-                return eh->h_proto;
+        if (proto >= 1536)
+                return proto;
                 
-        if (get_unaligned((u16 *) skb->data) == 0xFFFF)
-                return htons(ETH_P_802_3);
+        if (get_unaligned((__be16 *) skb->data) == htons(0xFFFF))
+                return ETH_P_802_3;
                 
-        return htons(ETH_P_802_2);
+        return ETH_P_802_2;
 }
 
 static inline int bnep_net_proto_filter(struct sk_buff *skb, struct bnep_session *s)