This is a resend of the iproute VLAN patch with the if_link.h changes edited out since the headers are already synced.