From: David S. Miller Date: Wed, 30 Oct 2013 21:18:57 +0000 (-0400) Subject: Merge branch '6lowpan' X-Git-Tag: Ubuntu-5.2.0-15.16~14566^2~91 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=8715fb364f87329ae52a03935942b6f0ee5482fe;p=mirror_ubuntu-eoan-kernel.git Merge branch '6lowpan' Alexander Aring says: ==================== This patch series cleanup the 6LoWPAN header creation and extend the use of skb_*_header functions. Patch 2/4 fix issues of parsing the mac header. The ieee802.15.4 header has a dynamic size which depends on frame control bits. This patch replaces the static mac header len calculation with a dynamic one. ==================== Signed-off-by: David S. Miller --- 8715fb364f87329ae52a03935942b6f0ee5482fe