pull request [net]: batman-adv 2014-01-16

pull request [net]: batman-adv 2014-01-16

[Antonio Quartulli]

Hello David,

here you have a very small fix intended for net/linux-3.13.

This patch is fixing the batman-adv overhead computation
(by Marek Lindner).
The result of such operation is used to initialize the
hard_header_len member of the soft-interface netdev object.


Please pull or let me know of any problem!

Thanks a lot,
	Antonio



The following changes since commit 51bb352f15595f2dee42b599680809de3d08999d:

  qlge: Fix vlan netdev features. (2014-01-14 19:02:35 -0800)

are available in the git repository at:

  git://git.open-mesh.org/linux-merge.git tags/batman-adv-fix-for-davem

for you to fetch changes up to 1df0cbd509bc21b0c331358c1f9d9a6fc94bada8:

  batman-adv: fix batman-adv header overhead calculation (2014-01-15 23:54:20 +0100)

----------------------------------------------------------------
Included change:
- properly compute the batman-adv header overhead. Such
  result is later used to initialize the hard_header_len
  member of the soft-interface netdev object

----------------------------------------------------------------
Marek Lindner (1):
      batman-adv: fix batman-adv header overhead calculation

 net/batman-adv/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[PATCH] batman-adv: fix batman-adv header overhead calculation

[Antonio Quartulli]

From: Marek Lindner <mareklindner@neomailbox.ch>

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>
---
 net/batman-adv/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;
 }
 
 /**
-- 
1.8.5.3

Re: pull request [net]: batman-adv 2014-01-16

[David Miller]

From: Antonio Quartulli <antonio@meshcoding.com>
Date: Thu, 16 Jan 2014 00:10:43 +0100

> here you have a very small fix intended for net/linux-3.13.
> 
> This patch is fixing the batman-adv overhead computation
> (by Marek Lindner).
> The result of such operation is used to initialize the
> hard_header_len member of the soft-interface netdev object.
> 
> Please pull or let me know of any problem!

Pulled, thanks Antonio.