diff options
author | David S. Miller <davem@davemloft.net> | 2014-01-16 17:16:43 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-01-16 17:16:43 -0800 |
commit | 8c12ec741174668d80d7301c298d1d183f92b937 (patch) | |
tree | 4d83a2c9030bde22372f3a961a079837c5806915 /net/ipv4/tcp_metrics.c | |
parent | e1000e: Fix compilation warning when !CONFIG_PM_SLEEP (diff) | |
parent | batman-adv: fix batman-adv header overhead calculation (diff) | |
download | linux-dev-8c12ec741174668d80d7301c298d1d183f92b937.tar.xz linux-dev-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>
Diffstat (limited to 'net/ipv4/tcp_metrics.c')
0 files changed, 0 insertions, 0 deletions