Commit f870b8c6 authored by Alexander Aring's avatar Alexander Aring Committed by Marcel Holtmann
Browse files

ieee802154: reassembly: fix tag byteorder 



This patch fix byte order handling in reassembly code of 802.15.4
6LoWPAN fragmentation handling.

net/ieee802154/reassembly.c:58:43: warning: restricted __be16 degrades to integer

Signed-off-by: default avatarAlexander Aring <alex.aring@gmail.com>
Reported-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent cd97a713

net/ieee802154/reassembly.c

+5 −3
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
static const char lowpan_frags_cache_name[] = "lowpan-frags";



struct lowpan_frag_info {

	__be16 d_tag;

	u16 d_tag;

	u16 d_size;

	u8 d_offset;

};
@@ -48,7 +48,7 @@ static struct inet_frags lowpan_frags; 
static int lowpan_frag_reasm(struct lowpan_frag_queue *fq,

			     struct sk_buff *prev, struct net_device *dev);



static unsigned int lowpan_hash_frag(__be16 tag, u16 d_size,

static unsigned int lowpan_hash_frag(u16 tag, u16 d_size,

				     const struct ieee802154_addr *saddr,

				     const struct ieee802154_addr *daddr)

{
@@ -330,11 +330,13 @@ static int lowpan_get_frag_info(struct sk_buff *skb, const u8 frag_type, 
{

	bool fail;

	u8 pattern = 0, low = 0;

	__be16 d_tag = 0;



	fail = lowpan_fetch_skb(skb, &pattern, 1);

	fail |= lowpan_fetch_skb(skb, &low, 1);

	frag_info->d_size = (pattern & 7) << 8 | low;

	fail |= lowpan_fetch_skb(skb, &frag_info->d_tag, 2);

	fail |= lowpan_fetch_skb(skb, &d_tag, 2);

	frag_info->d_tag = ntohs(d_tag);



	if (frag_type == LOWPAN_DISPATCH_FRAGN) {

		fail |= lowpan_fetch_skb(skb, &frag_info->d_offset, 1);

net/ieee802154/reassembly.h

+2 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
#include <net/inet_frag.h>



struct lowpan_create_arg {

	__be16 tag;

	u16 tag;

	u16 d_size;

	const struct ieee802154_addr *src;

	const struct ieee802154_addr *dst;
@@ -15,7 +15,7 @@ struct lowpan_create_arg { 
struct lowpan_frag_queue {

	struct inet_frag_queue	q;



	__be16			tag;

	u16			tag;

	u16			d_size;

	struct ieee802154_addr	saddr;

	struct ieee802154_addr	daddr;

CRA Git | Maintained and supported by SUSTech CRA and CCSE