From 81c0e4119667fd9d4d8eb987be85a2d64b03eee8 Mon Sep 17 00:00:00 2001 From: yar Date: Tue, 11 Oct 2005 22:55:16 +0000 Subject: Mark sk(4) as capable of handling extended VLAN frames. NICs based on XMAC II chip should be ready for this in their initial mode of operation, and Yukon-based NICs are configured so by the driver. PR: kern/79998 MFC after: 1 month --- sys/dev/sk/if_sk.c | 6 ++++++ sys/pci/if_sk.c | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/sys/dev/sk/if_sk.c b/sys/dev/sk/if_sk.c index 6ae2352..d83630e 100644 --- a/sys/dev/sk/if_sk.c +++ b/sys/dev/sk/if_sk.c @@ -1459,6 +1459,12 @@ sk_attach(dev) if_initname(ifp, device_get_name(dev), device_get_unit(dev)); ifp->if_mtu = ETHERMTU; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; + /* + * The hardware should be ready for VLAN_MTU by default: + * XMAC II has 0x8100 in VLAN Tag Level 1 register initially; + * YU_SMR_MFL_VLAN is set by this driver in Yukon. + */ + ifp->if_capabilities = ifp->if_capenable = IFCAP_VLAN_MTU; ifp->if_ioctl = sk_ioctl; ifp->if_start = sk_start; ifp->if_watchdog = sk_watchdog; diff --git a/sys/pci/if_sk.c b/sys/pci/if_sk.c index 6ae2352..d83630e 100644 --- a/sys/pci/if_sk.c +++ b/sys/pci/if_sk.c @@ -1459,6 +1459,12 @@ sk_attach(dev) if_initname(ifp, device_get_name(dev), device_get_unit(dev)); ifp->if_mtu = ETHERMTU; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; + /* + * The hardware should be ready for VLAN_MTU by default: + * XMAC II has 0x8100 in VLAN Tag Level 1 register initially; + * YU_SMR_MFL_VLAN is set by this driver in Yukon. + */ + ifp->if_capabilities = ifp->if_capenable = IFCAP_VLAN_MTU; ifp->if_ioctl = sk_ioctl; ifp->if_start = sk_start; ifp->if_watchdog = sk_watchdog; -- cgit v1.1