Commit 84ce1ddf authored by Alexander Aring's avatar Alexander Aring Committed by David S. Miller
Browse files

6lowpan: init ipv6hdr buffer to zero 



This patch simplify the handling to set fields inside of struct ipv6hdr
to zero. Instead of setting some memory regions with memset to zero we
initialize the whole ipv6hdr to zero.

This is a simplification for parsing the 6lowpan header for the upcomming
patches.

Signed-off-by: default avatarAlexander Aring <alex.aring@gmail.com>
Reviewed-by: default avatarWerner Almesberger <werner@almesberger.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4cffa13d

net/ieee802154/6lowpan.c

+1 −11
Original line number Diff line number Diff line
@@ -223,10 +223,6 @@ lowpan_uncompress_addr(struct sk_buff *skb, struct in6_addr *ipaddr, 
	if (prefcount > 0)

		memcpy(ipaddr, prefix, prefcount);



	if (prefcount + postcount < 16)

		memset(&ipaddr->s6_addr[prefcount], 0,

					16 - (prefcount + postcount));



	if (postcount > 0) {

		memcpy(&ipaddr->s6_addr[16 - postcount], skb->data, postcount);

		skb_pull(skb, postcount);
@@ -723,7 +719,7 @@ frame_err: 
static int

lowpan_process_data(struct sk_buff *skb)

{

	struct ipv6hdr hdr;

	struct ipv6hdr hdr = {};

	u8 tmp, iphc0, iphc1, num_context = 0;

	u8 *_saddr, *_daddr;

	int err;
@@ -868,8 +864,6 @@ lowpan_process_data(struct sk_buff *skb) 


		hdr.priority = ((tmp >> 2) & 0x0f);

		hdr.flow_lbl[0] = ((tmp << 6) & 0xC0) | ((tmp >> 2) & 0x30);

		hdr.flow_lbl[1] = 0;

		hdr.flow_lbl[2] = 0;

		break;

	/*

	 * Flow Label carried in-line
@@ -885,10 +879,6 @@ lowpan_process_data(struct sk_buff *skb) 
		break;

	/* Traffic Class and Flow Label are elided */

	case 3: /* 11b */

		hdr.priority = 0;

		hdr.flow_lbl[0] = 0;

		hdr.flow_lbl[1] = 0;

		hdr.flow_lbl[2] = 0;

		break;

	default:

		break;

CRA Git | Maintained and supported by SUSTech CRA and CCSE