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

Commit e87183c2 authored by David S. Miller's avatar David S. Miller
Browse files

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



Included changes:
- The last batch of patches aimed to clean the batman-adv namespace
- a couple of style fixes
- a fix for the ethtool support
- a fix to prevent sending unicast packets with an uninitialised header
  field

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents a59a4d19 162d549c

net/batman-adv/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -19,11 +19,10 @@ 
#



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

batman-adv-y += bat_debugfs.o

batman-adv-y += bat_iv_ogm.o

batman-adv-y += bat_sysfs.o

batman-adv-y += bitarray.o

batman-adv-$(CONFIG_BATMAN_ADV_BLA) += bridge_loop_avoidance.o

batman-adv-y += debugfs.o

batman-adv-y += gateway_client.o

batman-adv-y += gateway_common.o

batman-adv-y += hard-interface.o
@@ -35,6 +34,7 @@ batman-adv-y += ring_buffer.o 
batman-adv-y += routing.o

batman-adv-y += send.o

batman-adv-y += soft-interface.o

batman-adv-y += sysfs.o

batman-adv-y += translation-table.o

batman-adv-y += unicast.o

batman-adv-y += vis.o

net/batman-adv/bat_iv_ogm.c

+233 −226

File changed.

Preview size limit exceeded, changes collapsed.

net/batman-adv/bitarray.c

+3 −3
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ static void batadv_bitmap_shift_left(unsigned long *seq_bits, int32_t n) 
int batadv_bit_get_packet(void *priv, unsigned long *seq_bits,

			  int32_t seq_num_diff, int set_mark)

{

	struct bat_priv *bat_priv = priv;

	struct batadv_priv *bat_priv = priv;



	/* sequence number is slightly older. We already got a sequence number

	 * higher than this one, so we just mark it.
@@ -66,7 +66,7 @@ int batadv_bit_get_packet(void *priv, unsigned long *seq_bits, 
	/* sequence number is much newer, probably missed a lot of packets */

	if (seq_num_diff >= BATADV_TQ_LOCAL_WINDOW_SIZE &&

	    seq_num_diff < BATADV_EXPECTED_SEQNO_RANGE) {

		batadv_dbg(DBG_BATMAN, bat_priv,

		batadv_dbg(BATADV_DBG_BATMAN, bat_priv,

			   "We missed a lot of packets (%i) !\n",

			   seq_num_diff - 1);

		bitmap_zero(seq_bits, BATADV_TQ_LOCAL_WINDOW_SIZE);
@@ -83,7 +83,7 @@ int batadv_bit_get_packet(void *priv, unsigned long *seq_bits, 
	if (seq_num_diff <= -BATADV_TQ_LOCAL_WINDOW_SIZE ||

	    seq_num_diff >= BATADV_EXPECTED_SEQNO_RANGE) {



		batadv_dbg(DBG_BATMAN, bat_priv,

		batadv_dbg(BATADV_DBG_BATMAN, bat_priv,

			   "Other host probably restarted!\n");



		bitmap_zero(seq_bits, BATADV_TQ_LOCAL_WINDOW_SIZE);

net/batman-adv/bridge_loop_avoidance.c

+154 −148

File changed.

Preview size limit exceeded, changes collapsed.

net/batman-adv/bridge_loop_avoidance.h

+24 −24

File changed.

Preview size limit exceeded, changes collapsed.