From: David S. Miller Date: Sat, 11 May 2013 23:23:44 +0000 (-0700) Subject: Merge tag 'batman-adv-fix-for-davem' of git://git.open-mesh.org/linux-merge X-Git-Tag: firefly_0821_release~3680^2~478^2~15 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=fb863b8beaf8121199c3dc32ab0126e8ce9cb34a;p=firefly-linux-kernel-4.4.55.git 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 --- fb863b8beaf8121199c3dc32ab0126e8ce9cb34a