From: David S. Miller Date: Thu, 13 Jun 2013 08:26:54 +0000 (-0700) Subject: Merge tag 'batman-adv-fix-for-davem' of git://git.open-mesh.org/linux-merge X-Git-Tag: v3.10-rc6~2^2~16 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=e86c986137ee410190093d9ba86b86854861b9d5;p=~emulex%2Finfiniband.git Merge tag 'batman-adv-fix-for-davem' of git://git.open-mesh.org/linux-merge Included change: - fix "rtnl locked" concurrent executions by using rtnl_lock instead of rtnl_trylock. This fix enables batman-adv initialisation to do not fail just because somewhere else in the system another code path is holding the rtnl lock. It is easy to see the problem when batman-adv is trying to start together with other networking components. - fix the routing protocol forwarding policy by enhancing the duplicate control packet detection. When the right circumstances trigger the issue, some nodes in the network become totally unreachable, so breaking the mesh connectivity. - fix the Bridge Loop Avoidance component by not running the originator address change handling routine when the component is disabled. The routine was generating useless packets that were sent over the network. Signed-off-by: David S. Miller --- e86c986137ee410190093d9ba86b86854861b9d5