pf: deduplicate IPPROTO_ICMPV6 and IPPROTO_ICMP handling

These blocks were nearly identical, so handle them with the same code.

Sponsored by: Rubicon Communications, LLC ("Netgate")