bnep endianness annotations
PATCH 1/1 bnep endianness annotations
Signed-off-by Al Viro <[email protected]>
--- net/bluetooth/bnep/bnep.h | 8 ++++---- net/bluetooth/bnep/core.c | 12 ++++++------ net/bluetooth/bnep/netdev.c | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-)
net/bluetooth/bnep/bnep.h +4 -4
@@ -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 {
@@ -143,8 +143,8 @@ struct bnep_connlist_req { };struct bnep_proto_filter { -__u16 start; -__u16 end; +__be16 start; +__be16 end; };int bnep_add_connection (struct bnep_connadd_req *req,struct socket *sock);
net/bluetooth/bnep/core.c +6 -6
@@ -128,7 +128,7 @@ static inline void bnep_set_default_prot }#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;
@@ -180,7 +180,7 @@ static int bnep_ctrl_set_mcfilter(structif (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 bif (!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 bif (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 bcase 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 bcase 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 ; }
net/bluetooth/bnep/netdev.c +2 -2
@@ -155,7 +155,7 @@ #endif#ifdef CONFIG_BT_BNEP_PROTO_FILTER /* Determine ether protocol. Based on eth_type_trans. */ -static inline u16 bnep_net_eth_proto (struct sk_buff *skb) +static inline __be16 bnep_net_eth_proto (struct sk_buff *skb) {struct ethhdr *eh = (void *) skb->data;
@@ -170,7 +170,7 @@ static inline u16 bnep_net_eth_proto(strstatic inline int bnep_net_proto_filter (struct sk_buff *skb,struct bnep_session *s) { -u16 proto =bnep_net_eth_proto (skb); +__be16 proto =bnep_net_eth_proto (skb);struct bnep_proto_filter *f = s->proto_filter;int i;
Signature · 1 line
1.4.2.GIT
... that would be [PATCH 3/4]...