]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge tag 'batman-adv-fix-for-davem' of git://git.open-mesh.org/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Thu, 13 Jun 2013 08:26:54 +0000 (01:26 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 13 Jun 2013 08:26:54 +0000 (01:26 -0700)
commite86c986137ee410190093d9ba86b86854861b9d5
tree02a3830ddfb3d9994647a2750a3f69045769d7b0
parent94f950c4060cd9b1989c565284beb159b9705a50
parentd5b4c93e67b0b1291aa8e2aaf694e40afc3412d0
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 <davem@davemloft.net>