Skip to content

Commit

Permalink
6lowpan: init ipv6hdr buffer to zero
Browse files Browse the repository at this point in the history
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: Alexander Aring <alex.aring@gmail.com>
Reviewed-by: Werner Almesberger <werner@almesberger.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Alexander Aring authored and David S. Miller committed Aug 20, 2013
1 parent 4cffa13 commit 84ce1dd
Showing 1 changed file with 1 addition and 11 deletions.
12 changes: 1 addition & 11 deletions net/ieee802154/6lowpan.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -723,7 +719,7 @@ lowpan_alloc_new_frame(struct sk_buff *skb, u16 len, u16 tag)
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;
Expand Down Expand Up @@ -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
Expand All @@ -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;
Expand Down

0 comments on commit 84ce1dd

Please sign in to comment.