CVS commit: src/sys/dev/pci

[Christoph Egger]

Module Name:    src
Committed By:   cegger
Date:           Tue Jul 20 09:17:24 UTC 2010

Modified Files:
        src/sys/dev/pci: if_age.c if_ale.c

Log Message:
PR kern/38871: Fix VLAN


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sys/dev/pci/if_age.c
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/pci/if_ale.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/dev/pci/if_age.c
diff -u src/sys/dev/pci/if_age.c:1.38 src/sys/dev/pci/if_age.c:1.39
--- src/sys/dev/pci/if_age.c:1.38	Mon Apr  5 07:20:24 2010
+++ src/sys/dev/pci/if_age.c	Tue Jul 20 09:17:24 2010
@@ -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);
 }

Index: src/sys/dev/pci/if_ale.c
diff -u src/sys/dev/pci/if_ale.c:1.11 src/sys/dev/pci/if_ale.c:1.12
--- src/sys/dev/pci/if_ale.c:1.11	Mon Apr  5 07:20:25 2010
+++ src/sys/dev/pci/if_ale.c	Tue Jul 20 09:17:24 2010
@@ -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 <yong...@freebsd.org>
@@ -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);
 }