Rearranged NIC enumeration to match OS version support