Stephen,
You need to pull the latest net-2.6 include/linux/xfrm.h for this 
(and the earlier migrate stuff from Nakamura-san)...

cheers,
jamal