The following commit has been merged in the master branch: commit 1df0cbd509bc21b0c331358c1f9d9a6fc94bada8 Author: Marek Lindner mareklindner@neomailbox.ch Date: Wed Jan 15 20:31:18 2014 +0800

batman-adv: fix batman-adv header overhead calculation

Batman-adv prepends a full ethernet header in addition to its own header. This has to be reflected in the MTU calculation, especially since the value is used to set dev->hard_header_len.

Introduced by 411d6ed93a5d0601980d3e5ce75de07c98e3a7de ("batman-adv: consider network coding overhead when calculating required mtu")

Reported-by: cmsv cmsv@wirelesspt.net Reported-by: Martin Hundebøll martin@hundeboll.net Signed-off-by: Marek Lindner mareklindner@neomailbox.ch Signed-off-by: Antonio Quartulli antonio@meshcoding.com

diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index 1511f64..faba0f6 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@ -277,7 +277,7 @@ int batadv_max_header_len(void) sizeof(struct batadv_coded_packet)); #endif

- return header_len; + return header_len + ETH_HLEN; }

/**