| commit | fb863b8beaf8121199c3dc32ab0126e8ce9cb34a | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Sat May 11 16:23:44 2013 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Sat May 11 16:23:44 2013 -0700 |
| tree | 6ce4b8a34c53d7261d6ef3aa85e7198ecb1f8da5 | |
| parent | 2fbd967973ae6ae1a989f5638da8bbed93cad2c5 [diff] | |
| parent | a4361860351e87876aebd9595906d928ce8572c6 [diff] |
Merge tag 'batman-adv-fix-for-davem' of git://git.open-mesh.org/linux-merge Included changes: - fix parsing of user typed protocol string to avoid random memory access in some cases - check pskb_trim_rcsum() return value - prevent DAT from sending ARP replies when not needed - reorder the main clean up routine to prevent race conditions Signed-off-by: David S. Miller <davem@davemloft.net>