Fix a bug in the patches I sent yesterday. Should apply cleanly with
or without the macvlan stuff.