[src/trunk]: src/sys/dev/pci PR kern/38871: Fix VLAN

[cegger <cegger%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/7286f21bae8c
branches:  trunk
changeset: 756500:7286f21bae8c
user:      cegger <cegger%NetBSD.org@localhost>
date:      Tue Jul 20 09:17:24 2010 +0000

description:
PR kern/38871: Fix VLAN

diffstat:

 sys/dev/pci/if_age.c |  6 +++---
 sys/dev/pci/if_ale.c |  7 +++----
 2 files changed, 6 insertions(+), 7 deletions(-)

diffs (59 lines):

diff -r 01515d151c88 -r 7286f21bae8c sys/dev/pci/if_age.c
--- a/sys/dev/pci/if_age.c      Tue Jul 20 06:17:20 2010 +0000
+++ b/sys/dev/pci/if_age.c      Tue Jul 20 09:17:24 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_age.c,v 1.38 2010/04/05 07:20:24 joerg Exp $ */
+/*     $NetBSD: if_age.c,v 1.39 2010/07/20 09:17:24 cegger Exp $ */
 /*     $OpenBSD: if_age.c,v 1.1 2009/01/16 05:00:34 kevlo Exp $        */
 
 /*-
@@ -31,7 +31,7 @@
 /* Driver for Attansic Technology Corp. L1 Gigabit Ethernet. */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_age.c,v 1.38 2010/04/05 07:20:24 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_age.c,v 1.39 2010/07/20 09:17:24 cegger Exp $");
 
 #include "vlan.h"
 
@@ -2235,7 +2235,7 @@
 
        reg = CSR_READ_4(sc, AGE_MAC_CFG);
        reg &= ~MAC_CFG_VLAN_TAG_STRIP;
-       if (sc->sc_ec.ec_capabilities & ETHERCAP_VLAN_HWTAGGING)
+       if (sc->sc_ec.ec_capenable & ETHERCAP_VLAN_HWTAGGING)
                reg |= MAC_CFG_VLAN_TAG_STRIP;
        CSR_WRITE_4(sc, AGE_MAC_CFG, reg);
 }
diff -r 01515d151c88 -r 7286f21bae8c sys/dev/pci/if_ale.c
--- a/sys/dev/pci/if_ale.c      Tue Jul 20 06:17:20 2010 +0000
+++ b/sys/dev/pci/if_ale.c      Tue Jul 20 09:17:24 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_ale.c,v 1.11 2010/04/05 07:20:25 joerg Exp $        */
+/*     $NetBSD: if_ale.c,v 1.12 2010/07/20 09:17:24 cegger Exp $       */
 
 /*-
  * Copyright (c) 2008, Pyun YongHyeon <yongari%FreeBSD.org@localhost>
@@ -32,7 +32,7 @@
 /* Driver for Atheros AR8121/AR8113/AR8114 PCIe Ethernet. */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ale.c,v 1.11 2010/04/05 07:20:25 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ale.c,v 1.12 2010/07/20 09:17:24 cegger Exp $");
 
 #include "vlan.h"
 
@@ -1973,12 +1973,11 @@
 static void
 ale_rxvlan(struct ale_softc *sc)
 {
-       struct ifnet *ifp = &sc->sc_ec.ec_if;
        uint32_t reg;
 
        reg = CSR_READ_4(sc, ALE_MAC_CFG);
        reg &= ~MAC_CFG_VLAN_TAG_STRIP;
-       if (ifp->if_capabilities & ETHERCAP_VLAN_HWTAGGING)
+       if (sc->sc_ec.ec_capenable & ETHERCAP_VLAN_HWTAGGING)
                reg |= MAC_CFG_VLAN_TAG_STRIP;
        CSR_WRITE_4(sc, ALE_MAC_CFG, reg);
 }