aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-01-16 17:16:43 -0800
committerDavid S. Miller <davem@davemloft.net>2014-01-16 17:16:43 -0800
commit8c12ec741174668d80d7301c298d1d183f92b937 (patch)
tree4d83a2c9030bde22372f3a961a079837c5806915
parent38a529b5d42e4cfc5ac94844e61335a00eb2d320 (diff)
parent1df0cbd509bc21b0c331358c1f9d9a6fc94bada8 (diff)
downloadlinux-8c12ec741174668d80d7301c298d1d183f92b937.tar.gz
Merge tag 'batman-adv-fix-for-davem' of git://git.open-mesh.org/linux-merge
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 Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/batman-adv/main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c
index 1511f64a6ce..faba0f61ad5 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;
}
/**