Merge branch 'batman-adv/next' of git://git.open-mesh.org/linux-merge (f8bae99e) · Commits · e / devices / android_kernel_oneplus_sm8150

net/batman-adv/aggregation.c

+20 −5

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@

		/* return true if new_packet can be aggregated with forw_packet */
		static bool can_aggregate_with(const struct batman_packet *new_batman_packet,
		struct bat_priv *bat_priv,
		int packet_len,
		unsigned long send_time,
		bool directlink,
		@@ -37,6 +38,8 @@ static bool can_aggregate_with(const struct batman_packet *new_batman_packet,
		struct batman_packet *batman_packet =
		(struct batman_packet *)forw_packet->skb->data;
		int aggregated_bytes = forw_packet->packet_len + packet_len;
		struct hard_iface *primary_if = NULL;
		bool res = false;

		/**
		* we can aggregate the current packet to this aggregated packet
		@@ -61,6 +64,10 @@ static bool can_aggregate_with(const struct batman_packet *new_batman_packet,
		* packet
		*/

		primary_if = primary_if_get_selected(bat_priv);
		if (!primary_if)
		goto out;

		/* packets without direct link flag and high TTL
		* are flooded through the net */
		if ((!directlink) &&
		@@ -70,8 +77,10 @@ static bool can_aggregate_with(const struct batman_packet *new_batman_packet,
		/* own packets originating non-primary
		* interfaces leave only that interface */
		((!forw_packet->own) \|\|
		(forw_packet->if_incoming->if_num == 0)))
		return true;
		(forw_packet->if_incoming == primary_if))) {
		res = true;
		goto out;
		}

		/* if the incoming packet is sent via this one
		* interface only - we still can aggregate */
		@@ -84,11 +93,16 @@ static bool can_aggregate_with(const struct batman_packet *new_batman_packet,
		* (= secondary interface packets in general) */
		(batman_packet->flags & DIRECTLINK \|\|
		(forw_packet->own &&
		forw_packet->if_incoming->if_num != 0)))
		return true;
		forw_packet->if_incoming != primary_if))) {
		res = true;
		goto out;
		}
		}

		return false;
		out:
		if (primary_if)
		hardif_free_ref(primary_if);
		return res;
		}

		/* create a new aggregated packet and add this packet to it */
		@@ -210,6 +224,7 @@ void add_bat_packet_to_list(struct bat_priv *bat_priv,
		hlist_for_each_entry(forw_packet_pos, tmp_node,
		&bat_priv->forw_bat_list, list) {
		if (can_aggregate_with(batman_packet,
		bat_priv,
		packet_len,
		send_time,
		direct_link,

net/batman-adv/gateway_client.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -487,10 +487,9 @@ int gw_client_seq_print_text(struct seq_file seq, void offset)
		}

		seq_printf(seq, " %-12s (%s/%i) %17s [%10s]: gw_class ... "
		"[B.A.T.M.A.N. adv %s%s, MainIF/MAC: %s/%pM (%s)]\n",
		"[B.A.T.M.A.N. adv %s, MainIF/MAC: %s/%pM (%s)]\n",
		"Gateway", "#", TQ_MAX_VALUE, "Nexthop",
		"outgoingIF", SOURCE_VERSION, REVISION_VERSION_STR,
		primary_if->net_dev->name,
		"outgoingIF", SOURCE_VERSION, primary_if->net_dev->name,
		primary_if->net_dev->dev_addr, net_dev->name);

		rcu_read_lock();

net/batman-adv/main.c

+2 −7

Original line number	Diff line number	Diff line
		@@ -58,9 +58,8 @@ static int __init batman_init(void)

		register_netdevice_notifier(&hard_if_notifier);

		pr_info("B.A.T.M.A.N. advanced %s%s (compatibility version %i) "
		"loaded\n", SOURCE_VERSION, REVISION_VERSION_STR,
		COMPAT_VERSION);
		pr_info("B.A.T.M.A.N. advanced %s (compatibility version %i) "
		"loaded\n", SOURCE_VERSION, COMPAT_VERSION);

		return 0;
		}
		@@ -184,8 +183,4 @@ MODULE_LICENSE("GPL");
		MODULE_AUTHOR(DRIVER_AUTHOR);
		MODULE_DESCRIPTION(DRIVER_DESC);
		MODULE_SUPPORTED_DEVICE(DRIVER_DEVICE);
		#ifdef REVISION_VERSION
		MODULE_VERSION(SOURCE_VERSION "-" REVISION_VERSION);
		#else
		MODULE_VERSION(SOURCE_VERSION);
		#endif

net/batman-adv/main.h

+3 −8

Original line number	Diff line number	Diff line
		@@ -27,8 +27,9 @@
		#define DRIVER_DESC "B.A.T.M.A.N. advanced"
		#define DRIVER_DEVICE "batman-adv"

		#define SOURCE_VERSION "next"

		#ifndef SOURCE_VERSION
		#define SOURCE_VERSION "2011.3.0"
		#endif

		/* B.A.T.M.A.N. parameters */

		@@ -144,12 +145,6 @@ enum dbg_level {
		#include <linux/seq_file.h>
		#include "types.h"

		#ifndef REVISION_VERSION
		#define REVISION_VERSION_STR ""
		#else
		#define REVISION_VERSION_STR " "REVISION_VERSION
		#endif

		extern struct list_head hardif_list;

		extern unsigned char broadcast_addr[];

net/batman-adv/originator.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -430,9 +430,8 @@ int orig_seq_print_text(struct seq_file seq, void offset)
		goto out;
		}

		seq_printf(seq, "[B.A.T.M.A.N. adv %s%s, MainIF/MAC: %s/%pM (%s)]\n",
		SOURCE_VERSION, REVISION_VERSION_STR,
		primary_if->net_dev->name,
		seq_printf(seq, "[B.A.T.M.A.N. adv %s, MainIF/MAC: %s/%pM (%s)]\n",
		SOURCE_VERSION, primary_if->net_dev->name,
		primary_if->net_dev->dev_addr, net_dev->name);
		seq_printf(seq, " %-15s %s (%s/%i) %17s [%10s]: %20s ...\n",
		"Originator", "last-seen", "#", TQ_MAX_VALUE, "Nexthop",