From: David S. Miller <davem@davemloft.net>
Date: Thu, 17 Oct 2013 18:27:09 +0000 (-0400)
Subject: Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=d7a20c86404bb423f843d4fe34cd1d11432892a0;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge

Included changes:
- ensure RecordRoute information is added to BAT_ICMP echo_request/reply only
- use VLAN_ETH_HLEN when possible
- use htons when possible
- substitute old fragmentation code with a new improved implementation by
  Martin Hundebøll
- create common header for BAT_ICMP packets to improve extendibility
- consider the network coding overhead when computing the overall room needed by
  batman headers
- add dummy soft-interface rx mode handler
- minor code refactoring and cleanups

Signed-off-by: David S. Miller <davem@davemloft.net>
---

d7a20c86404bb423f843d4fe34cd1d11432892a0