net/icmp: Ports the changes in ICMPv6 of commits 4629cf94 and 74a633ea to ICMP. ICMP and ICMPv6 sockets are nearly identical, bug-for-bug.