From: David S. Miller Date: Tue, 22 Jul 2014 03:19:09 +0000 (-0700) Subject: Merge tag 'batman-adv-fix-for-davem' of git://git.open-mesh.org/linux-merge X-Git-Tag: v3.16-rc7~23^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=850717ef00d8a224cf1aaffc9c636ea67e01cce2;p=platform%2Fkernel%2Flinux-stable.git Merge tag 'batman-adv-fix-for-davem' of git://git.open-mesh.org/linux-merge Antonio Quartulli says: ==================== pull request [net]: batman-adv 20140721 here you have two fixes that we have been testing for quite some time (this is why they arrived a bit late in the rc cycle). Patch 1) ensures that BLA packets get dropped and not forwarded to the mesh even if they reach batman-adv within QinQ frames. Forwarding them into the mesh means messing up with the TT database of other nodes which can generate all kind of unexpected behaviours during route computation. Patch 2) avoids a couple of race conditions triggered upon fast VLAN deletion-addition. Such race conditions are pretty dangerous because they not only create inconsistencies in the TT database of the nodes in the network, but such scenario is also unrecoverable (unless nodes are rebooted). ==================== Signed-off-by: David S. Miller --- 850717ef00d8a224cf1aaffc9c636ea67e01cce2