From: David S. Miller <davem@davemloft.net>
Date: Tue, 6 Jan 2015 19:24:49 +0000 (-0500)
Subject: Merge tag 'batman-adv-fix-for-davem' of git://git.open-mesh.org/linux-merge
X-Git-Tag: firefly_0821_release~176^2~2558^2~1
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=627d2cc016b67bd94f476d30fc4b3a031bac6fa7;p=firefly-linux-kernel-4.4.55.git

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

Included changes:
- ensure bonding is used (if enabled) for packets coming in the soft
  interface
- fix race condition to avoid orig_nodes to be deleted right after
  being added
- avoid false positive lockdep splats by assigning lockclass to
  the proper hashtable lock objects
- avoid miscounting of multicast 'disabled' nodes in the network
- fix memory leak in the Global Translation Table in case of
  originator interval change

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

627d2cc016b67bd94f476d30fc4b3a031bac6fa7