Pull up following revision(s) (requested by tls in ticket #627):
sys/dev/pci/if_wm.c: revision 1.171
Enable the vlan code that thorpej@NetBSD.org added, and fix a bug where
the vlan tag was read from the rx descriptor after it was reinitialized
(and hence was always 0).  Hardware vlan support looks good tested
between two vmware clients.
With support from tls@NetBSD.org.

(snj)