From: David S. Miller <davem@davemloft.net>
Date: Fri, 10 Jan 2014 22:59:34 +0000 (-0500)
Subject: Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
X-Git-Tag: v3.14-rc1~94^2~236
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=45593c2bd2d1e257d03d795f9c80e22e18f188f0;p=kernel%2Fkernel-generic.git

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

Included changes:
- substitute FSF address with URL
- deselect current bat-GW when GW-client mode gets deactivated
- send every DHCP packet using bat-unicast messages when GW-client mode is
  enabled
- implement the Extended Isolation mechanism (it is an enhancement of the
  already existing batman-AP-isolation). This mechanism allows the user to drop
  packets exchanged by selected clients by using netfilter marks.
- fix typ0 in header guard
- minor code cleanups

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

45593c2bd2d1e257d03d795f9c80e22e18f188f0