From 971205bfeeb854c2ea75b5eaddad9c591f2b3666 Mon Sep 17 00:00:00 2001 From: yar Date: Thu, 20 May 2004 11:04:09 +0000 Subject: [PATCH] Stylistic changes around the previous commit: - since the number of supported capabilities is growing, set bits in if_cap* in a consistent way; - unexpand(1) leading SPACE characters. --- sys/dev/em/if_em.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sys/dev/em/if_em.c b/sys/dev/em/if_em.c index 0bb5a5c5ddb9..5e508e109736 100644 --- a/sys/dev/em/if_em.c +++ b/sys/dev/em/if_em.c @@ -1855,9 +1855,11 @@ em_setup_interface(device_t dev, struct adapter * adapter) ether_ifattach(ifp, adapter->interface_data.ac_enaddr); #endif + ifp->if_capabilities = ifp->if_capenable = 0; + if (adapter->hw.mac_type >= em_82543) { - ifp->if_capabilities = IFCAP_HWCSUM; - ifp->if_capenable = ifp->if_capabilities; + ifp->if_capabilities |= IFCAP_HWCSUM; + ifp->if_capenable |= IFCAP_HWCSUM; } /* @@ -1865,7 +1867,7 @@ em_setup_interface(device_t dev, struct adapter * adapter) */ ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header); #if __FreeBSD_version >= 500000 - ifp->if_capabilities |= IFCAP_VLAN_HWTAGGING | IFCAP_VLAN_MTU; + ifp->if_capabilities |= IFCAP_VLAN_HWTAGGING | IFCAP_VLAN_MTU; ifp->if_capenable |= IFCAP_VLAN_HWTAGGING | IFCAP_VLAN_MTU; #endif