Fix build on newer kernels.
Fix vlan tagging when vlgroups are deprecated.