Derp. Don't include the IPv6 header in the plength.
Merge branch '20130428-tcp-provider' into markj-develop