You should use this patch instead, from Alan's tree, for updating
include/linux/if_arp.h...
-- 
Jeff Garzik       | May you have warm words on a cold evening,
Building 1024     | a full mooon on a dark night,
MandrakeSoft      | and a smooth road all the way to your door.