Commit 2fdf0880 authored by Paolo Abeni's avatar Paolo Abeni
Browse files

Merge tag 'batadv-net-pullrequest-20250318' of git://git.open-mesh.org/linux-merge 

Simon Wunderlich says:

====================
Here is batman-adv bugfix:

- Ignore own maximum aggregation size during RX, Sven Eckelmann

* tag 'batadv-net-pullrequest-20250318' of git://git.open-mesh.org/linux-merge:
  batman-adv: Ignore own maximum aggregation size during RX
====================

Link: https://patch.msgid.link/20250318150035.35356-1-sw@simonwunderlich.de


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parents 90a71386 548b0c5d

net/batman-adv/bat_iv_ogm.c

+1 −2
Original line number Diff line number Diff line
@@ -325,8 +325,7 @@ batadv_iv_ogm_aggr_packet(int buff_pos, int packet_len, 
	/* check if there is enough space for the optional TVLV */

	next_buff_pos += ntohs(ogm_packet->tvlv_len);



	return (next_buff_pos <= packet_len) &&

	       (next_buff_pos <= BATADV_MAX_AGGREGATION_BYTES);

	return next_buff_pos <= packet_len;

}



/* send a batman ogm to a given interface */

net/batman-adv/bat_v_ogm.c

+1 −2
Original line number Diff line number Diff line
@@ -839,8 +839,7 @@ batadv_v_ogm_aggr_packet(int buff_pos, int packet_len, 
	/* check if there is enough space for the optional TVLV */

	next_buff_pos += ntohs(ogm2_packet->tvlv_len);



	return (next_buff_pos <= packet_len) &&

	       (next_buff_pos <= BATADV_MAX_AGGREGATION_BYTES);

	return next_buff_pos <= packet_len;

}



/**