Module Name: src
Committed By: martin
Date: Mon Nov 27 14:09:11 UTC 2017
Modified Files:
src/sys/arch/mips/cavium/dev [netbsd-8]: if_cnmac.c
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #397):
sys/arch/mips/cavium/dev/if_cnmac.c: revision 1.7
Set ETHERCAP_VLAN_MTU capability flag.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.8.1 src/sys/arch/mips/cavium/dev/if_cnmac.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/arch/mips/cavium/dev/if_cnmac.c
diff -u src/sys/arch/mips/cavium/dev/if_cnmac.c:1.5 src/sys/arch/mips/cavium/dev/if_cnmac.c:1.5.8.1
--- src/sys/arch/mips/cavium/dev/if_cnmac.c:1.5 Thu Dec 15 09:28:03 2016
+++ src/sys/arch/mips/cavium/dev/if_cnmac.c Mon Nov 27 14:09:11 2017
@@ -1,8 +1,8 @@
-/* $NetBSD: if_cnmac.c,v 1.5 2016/12/15 09:28:03 ozaki-r Exp $ */
+/* $NetBSD: if_cnmac.c,v 1.5.8.1 2017/11/27 14:09:11 martin Exp $ */
#include <sys/cdefs.h>
#if 0
-__KERNEL_RCSID(0, "$NetBSD: if_cnmac.c,v 1.5 2016/12/15 09:28:03 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cnmac.c,v 1.5.8.1 2017/11/27 14:09:11 martin Exp $");
#endif
#include "opt_octeon.h"
@@ -366,6 +366,9 @@ octeon_eth_attach(device_t parent, devic
IFCAP_CSUM_IPv4_Rx | IFCAP_CSUM_TCPv4_Rx | IFCAP_CSUM_UDPv4_Rx |
IFCAP_CSUM_TCPv6_Rx | IFCAP_CSUM_UDPv6_Rx;
+ /* 802.1Q VLAN-sized frames are supported */
+ sc->sc_ethercom.ec_capabilities |= ETHERCAP_VLAN_MTU;
+
octeon_gmx_set_mac_addr(sc->sc_gmx_port, enaddr);
octeon_gmx_set_filter(sc->sc_gmx_port);