[src/trunk]: src/sys/arch/powerpc/booke/dev only get vtag when we have vtag l...

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

details:   https://anonhg.NetBSD.org/src/rev/0caa9a0a77a4
branches:  trunk
changeset: 356535:0caa9a0a77a4
user:      knakahara <knakahara%NetBSD.org@localhost>
date:      Mon Oct 02 01:55:40 2017 +0000

description:
only get vtag when we have vtag like the other drivers.

like if_bge.c:1.312 and if_stge.c:1.64.
fixed by s-yamaguchi@IIJ, thanks.

diffstat:

 sys/arch/powerpc/booke/dev/pq3etsec.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r f51c53348f49 -r 0caa9a0a77a4 sys/arch/powerpc/booke/dev/pq3etsec.c
--- a/sys/arch/powerpc/booke/dev/pq3etsec.c     Mon Oct 02 01:03:31 2017 +0000
+++ b/sys/arch/powerpc/booke/dev/pq3etsec.c     Mon Oct 02 01:55:40 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pq3etsec.c,v 1.30 2017/09/26 07:42:05 knakahara Exp $  */
+/*     $NetBSD: pq3etsec.c,v 1.31 2017/10/02 01:55:40 knakahara Exp $  */
 /*-
  * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -41,7 +41,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(0, "$NetBSD: pq3etsec.c,v 1.30 2017/09/26 07:42:05 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pq3etsec.c,v 1.31 2017/10/02 01:55:40 knakahara Exp $");
 
 #include <sys/param.h>
 #include <sys/cpu.h>
@@ -1996,7 +1996,7 @@
        KASSERT(m->m_flags & M_PKTHDR);
 
        have_vtag = vlan_has_tag(m);
-       vtag = vlan_get_tag(m);
+       vtag = (have_vtag) ? vlan_get_tag(m) : 0;
 
        /*
         * Let see if we are doing any offload first.
@@ -2031,7 +2031,7 @@
                fcb.txfcb_l4os = M_CSUM_DATA_IPv6_HL(m->m_pkthdr.csum_data);
        fcb.txfcb_l3os = ETHER_HDR_LEN;
        fcb.txfcb_phcs = 0;
-       fcb.txfcb_vlctl = have_vtag ? vtag : 0;
+       fcb.txfcb_vlctl = vtag;
 
 #if 0
        printf("%s: csum_flags=%#x: txfcb flags=%#x lsos=%u l4os=%u phcs=%u vlctl=%#x\n",