Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 45593c2b authored Jan 10, 2014 by David S. Miller

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>

parents 795709af 42cb0bef

Documentation/ABI/testing/sysfs-class-net-mesh

+8 −0

Original line number	Diff line number	Diff line
		@@ -68,6 +68,14 @@ Description:
		Defines the penalty which will be applied to an
		originator message's tq-field on every hop.

		What: /sys/class/net/<mesh_iface>/mesh/isolation_mark
		Date: Nov 2013
		Contact: Antonio Quartulli <antonio@meshcoding.com>
		Description:
		Defines the isolation mark (and its bitmask) which
		is used to classify clients as "isolated" by the
		Extended Isolation feature.

		What: /sys/class/net/<mesh_iface>/mesh/network_coding
		Date: Nov 2012
		Contact: Martin Hundeboll <martin@hundeboll.net>

net/batman-adv/Makefile

+1 −3

Original line number	Diff line number	Diff line
		@@ -13,9 +13,7 @@
		# General Public License for more details.
		#
		# You should have received a copy of the GNU General Public License
		# along with this program; if not, write to the Free Software
		# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
		# 02110-1301, USA
		# along with this program; if not, see <http://www.gnu.org/licenses/>.
		#

		obj-$(CONFIG_BATMAN_ADV) += batman-adv.o

net/batman-adv/bat_algo.h

+1 −3

Original line number	Diff line number	Diff line
		@@ -12,9 +12,7 @@
		* General Public License for more details.
		*
		* You should have received a copy of the GNU General Public License
		* along with this program; if not, write to the Free Software
		* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
		* 02110-1301, USA
		* along with this program; if not, see <http://www.gnu.org/licenses/>.
		*/

		#ifndef _NET_BATMAN_ADV_BAT_ALGO_H_

net/batman-adv/bat_iv_ogm.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -12,9 +12,7 @@
		* General Public License for more details.
		*
		* You should have received a copy of the GNU General Public License
		* along with this program; if not, write to the Free Software
		* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
		* 02110-1301, USA
		* along with this program; if not, see <http://www.gnu.org/licenses/>.
		*/

		#include "main.h"

net/batman-adv/bitarray.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -12,9 +12,7 @@
		* General Public License for more details.
		*
		* You should have received a copy of the GNU General Public License
		* along with this program; if not, write to the Free Software
		* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
		* 02110-1301, USA
		* along with this program; if not, see <http://www.gnu.org/licenses/>.
		*/

		#include "main.h"