OSDN Git Service

batman-adv: Use only queued fragments when merging
authorSven Eckelmann <sven@narfation.org>
Mon, 1 Dec 2014 09:37:28 +0000 (10:37 +0100)
committerAntonio Quartulli <antonio@meshcoding.com>
Fri, 29 May 2015 08:13:35 +0000 (10:13 +0200)
commit83e8b87721f21b26b843633caca8ef453e943623
treec987f856131f264bc54667c1531d75cb875a5256
parent53e771457e823fbc21834f60508c42a4270534fd
batman-adv: Use only queued fragments when merging

The fragment queueing code now validates the total_size of each fragment,
checks when enough fragments are queued to allow to merge them into a
single packet and if the fragments have the correct size. Therefore, it is
not required to have any other parameter for the merging function than a
list of queued fragments.

This change should avoid problems like in the past when the different skb
from the list and the function parameter were mixed incorrectly.

Signed-off-by: Sven Eckelmann <sven@narfation.org>
Acked-by: Martin Hundebøll <martin@hundeboll.net>
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
net/batman-adv/fragmentation.c