I've updated my IPsec MTU optimization patch I've posted a couple of month ago to net-2.6.22 and added the further optimization suggested by Herbert to account for the space lost due to alignment in the room reserved for IP options in transport mode. Tested with IPv4 and IPv6 in tunnel and transport mode. Beet mode is untested since no keying daemon seems to support it.