diff options
| author | David S. Miller <davem@davemloft.net> | 2014-01-17 02:16:43 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-01-17 02:16:43 +0100 |
| commit | 8c12ec741174668d80d7301c298d1d183f92b937 (patch) | |
| tree | 4d83a2c9030bde22372f3a961a079837c5806915 | |
| parent | e1000e: Fix compilation warning when !CONFIG_PM_SLEEP (diff) | |
| parent | batman-adv: fix batman-adv header overhead calculation (diff) | |
| download | linux-8c12ec741174668d80d7301c298d1d183f92b937.tar.xz linux-8c12ec741174668d80d7301c298d1d183f92b937.zip | |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index 1511f64a6cea..faba0f61ad53 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; } /** |