tree db116a813dd808850455b36ba1c5e34b523a251e
parent 1ef8019be8799c39f316a772ffdd705c46029752
parent c008ba5bdc9fa830e1a349b20b0be5a137bdef7a
author David S. Miller <davem@davemloft.net> 1415647549 -0500
committer David S. Miller <davem@davemloft.net> 1415647549 -0500

Merge branch 'raw_probe_proto_opt'

Herbert Xu says:

====================
ipv4: Simplify raw_probe_proto_opt and avoid reading user iov twice

This series rewrites the function raw_probe_proto_opt in a more
readable fasion, and then fixes the long-standing bug where we
read the probed bytes twice which means that what we're using to
probe may in fact be invalid.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>