diff options
| author | David S. Miller <davem@davemloft.net> | 2013-12-29 00:30:59 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-12-29 00:30:59 -0500 |
| commit | 8eb9bff0edefcce50116ec50397a60dd626022d6 (patch) | |
| tree | c9eedf01f9a08f1a87862c8eda3f33fe7287e23c /net/tipc | |
| parent | a72338a00ed19f68bb08a1b46dad5a315e562ed9 (diff) | |
| parent | 2b1e2cb3594df80446dc33bb8e12230da11f38ff (diff) | |
| download | linux-8eb9bff0edefcce50116ec50397a60dd626022d6.tar.gz linux-8eb9bff0edefcce50116ec50397a60dd626022d6.tar.bz2 linux-8eb9bff0edefcce50116ec50397a60dd626022d6.zip | |
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>
Diffstat (limited to 'net/tipc')
0 files changed, 0 insertions, 0 deletions