summaryrefslogtreecommitdiffstats
path: root/net/mac802154/wpan.c
diff options
context:
space:
mode:
authorAlexander Aring <alex.aring@gmail.com>2013-10-30 09:18:22 +0100
committerDavid S. Miller <davem@davemloft.net>2013-10-30 22:18:46 +0100
commit3e69162ea4a9e927cb3619b96c86aae4ded60112 (patch)
treec04fe5483df3b23beec9a21a285606f5e34768f1 /net/mac802154/wpan.c
parent6lowpan: remove unnecessary set of headers (diff)
downloadlinux-3e69162ea4a9e927cb3619b96c86aae4ded60112.tar.xz
linux-3e69162ea4a9e927cb3619b96c86aae4ded60112.zip
6lowpan: set and use mac_len for mac header length
Set the mac header length while creating the 802.15.4 mac header. Drop the function for recalculate mac header length in upper layers which was static and works for intra pan communication only. 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>
Diffstat (limited to 'net/mac802154/wpan.c')
-rw-r--r--net/mac802154/wpan.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/mac802154/wpan.c b/net/mac802154/wpan.c
index 2ca2f4dceab7..e24bcf977296 100644
--- a/net/mac802154/wpan.c
+++ b/net/mac802154/wpan.c
@@ -208,6 +208,8 @@ static int mac802154_header_create(struct sk_buff *skb,
head[1] = fc >> 8;
memcpy(skb_push(skb, pos), head, pos);
+ skb_reset_mac_header(skb);
+ skb->mac_len = pos;
return pos;
}