[src/netbsd-8]: src/sys/arch/mips/cavium/dev Pull up following revision(s) (r...

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

details:   https://anonhg.NetBSD.org/src/rev/c54fe583770e
branches:  netbsd-8
changeset: 434444:c54fe583770e
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Nov 27 14:09:11 2017 +0000

description:
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.

diffstat:

 sys/arch/mips/cavium/dev/if_cnmac.c |  7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diffs (24 lines):

diff -r 03fd0b8b884a -r c54fe583770e sys/arch/mips/cavium/dev/if_cnmac.c
--- a/sys/arch/mips/cavium/dev/if_cnmac.c       Mon Nov 27 14:07:53 2017 +0000
+++ b/sys/arch/mips/cavium/dev/if_cnmac.c       Mon Nov 27 14:09:11 2017 +0000
@@ -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 @@
                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);