Module Name: src
Committed By: snj
Date: Sun May 3 17:56:06 UTC 2009
Modified Files:
src/sys/dev/pci [netbsd-5]: if_wm.c
Log Message:
Pull up following revision(s) (requested by tls in ticket #627):
sys/dev/pci/if_wm.c: revision 1.172
Missed a small but important change to enable hardware VLAN support.
To generate a diff of this commit:
cvs rdiff -u -r1.162.4.5 -r1.162.4.6 src/sys/dev/pci/if_wm.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_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.162.4.5 src/sys/dev/pci/if_wm.c:1.162.4.6
--- src/sys/dev/pci/if_wm.c:1.162.4.5 Sun May 3 17:54:07 2009
+++ src/sys/dev/pci/if_wm.c Sun May 3 17:56:05 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.162.4.5 2009/05/03 17:54:07 snj Exp $ */
+/* $NetBSD: if_wm.c,v 1.162.4.6 2009/05/03 17:56:05 snj Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -79,7 +79,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.162.4.5 2009/05/03 17:54:07 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.162.4.6 2009/05/03 17:56:05 snj Exp $");
#include "bpfilter.h"
#include "rnd.h"
@@ -1546,7 +1546,7 @@
*/
if (sc->sc_type >= WM_T_82543)
sc->sc_ethercom.ec_capabilities |=
- ETHERCAP_VLAN_MTU /* XXXJRT | ETHERCAP_VLAN_HWTAGGING */;
+ ETHERCAP_VLAN_MTU | ETHERCAP_VLAN_HWTAGGING;
/*
* We can perform TCPv4 and UDPv4 checkums in-bound. Only
