From: David S. Miller <davem@davemloft.net>
Date: Sun, 29 Dec 2013 05:30:59 +0000 (-0500)
Subject: Merge tag 'batman-adv-fix-for-davem' of git://git.open-mesh.org/linux-merge
X-Git-Tag: v3.13-rc7~13^2~6
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8eb9bff0edefcce50116ec50397a60dd626022d6;p=kernel%2Fkernel-generic.git

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

Included changes:

- reset netfilter-bridge state when removing the batman-adv
  header from an incoming packet. This prevents netfilter
  bridge from being fooled when the same packet enters a
  bridge twice (or more): the first time within the
  batman-adv header and the second time without.

- adjust the packet layout to prevent any architecture from
  adding padding bytes. All the structs sent over the wire
  now have size multiple of 4bytes (unless pack(2) is used).

- fix access to the inner vlan_eth header when reading the
  VID in the rx path.

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

8eb9bff0edefcce50116ec50397a60dd626022d6