]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
projects / mirror_ubuntu-kernels.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 38a529b 1df0cbd)
Merge tag 'batman-adv-fix-for-davem' of git://git.open-mesh.org/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Fri, 17 Jan 2014 01:16:43 +0000 (17:16 -0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 17 Jan 2014 01:16:43 +0000 (17:16 -0800)
commit8c12ec741174668d80d7301c298d1d183f92b937
tree4d83a2c9030bde22372f3a961a079837c5806915tree
parent38a529b5d42e4cfc5ac94844e61335a00eb2d320commit | diff
parent1df0cbd509bc21b0c331358c1f9d9a6fc94bada8commit | diff
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>
Ubuntu combined Linux kernel mirror