[src/trunk]: src/sys/net/agr Mmh, fix a weird mistake: the guy who added #if ...

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

details:   https://anonhg.NetBSD.org/src/rev/e356aa2ad4ad
branches:  trunk
changeset: 358740:e356aa2ad4ad
user:      maxv <maxv%NetBSD.org@localhost>
date:      Mon Jan 15 11:16:04 2018 +0000

description:
Mmh, fix a weird mistake: the guy who added #if NVLAN > 0 forgot to
actually include vlan.h, so the branches are never compiled.

They don't compile, by the way, so fix that too, by reproducing the vlan
input path of ether_input().

diffstat:

 sys/net/agr/if_agr.c |  36 +++++++++++++++---------------------
 1 files changed, 15 insertions(+), 21 deletions(-)

diffs (82 lines):

diff -r 8b9da92335b3 -r e356aa2ad4ad sys/net/agr/if_agr.c
--- a/sys/net/agr/if_agr.c      Mon Jan 15 10:27:51 2018 +0000
+++ b/sys/net/agr/if_agr.c      Mon Jan 15 11:16:04 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_agr.c,v 1.43 2017/12/06 07:40:16 ozaki-r Exp $      */
+/*     $NetBSD: if_agr.c,v 1.44 2018/01/15 11:16:04 maxv Exp $ */
 
 /*-
  * Copyright (c)2005 YAMAMOTO Takashi,
@@ -27,12 +27,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_agr.c,v 1.43 2017/12/06 07:40:16 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_agr.c,v 1.44 2018/01/15 11:16:04 maxv Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #endif
 
+#include "vlan.h"
+
 #include <sys/param.h>
 #include <sys/callout.h>
 #include <sys/malloc.h>
@@ -53,6 +55,7 @@
 #include <net/if_dl.h>
 #include <net/if_types.h>
 #include <net/if_ether.h>
+#include <net/if_vlanvar.h>
 
 #if defined(INET)
 #include <netinet/in.h>
@@ -146,11 +149,9 @@
 void
 agr_input(struct ifnet *ifp_port, struct mbuf *m)
 {
+       struct ethercom *ec = (struct ethercom *)ifp_port;
        struct agr_port *port;
        struct ifnet *ifp;
-#if NVLAN > 0
-       struct m_tag *mtag;
-#endif
 
        port = ifp_port->if_agrprivate;
        KASSERT(port);
@@ -163,26 +164,19 @@
 
        m_set_rcvif(m, ifp);
 
-#define DNH_DEBUG
+       /*
+        * If VLANs are configured on the interface, check to
+        * see if the device performed the decapsulation and
+        * provided us with the tag.
+        */
+       if (ec->ec_nvlans && vlan_has_tag(m)) {
 #if NVLAN > 0
-       /* got a vlan packet? */
-       if ((mtag = m_tag_find(m, PACKET_TAG_VLAN, NULL)) != NULL) {
-#ifdef DNH_DEBUG 
-               printf("%s: vlan tag %d attached\n",
-                       ifp->if_xname,
-                       htole16((*(u_int *)(mtag + 1)) & 0xffff));
-               printf("%s: vlan input\n", ifp->if_xname);
+               vlan_input(ifp, m);
+#else
+               m_freem(m);
 #endif
-               vlan_input(ifp, m);
                return;
-#ifdef DNH_DEBUG 
-       } else {
-               struct ethercom *ec = (void *)ifp;
-               printf("%s: no vlan tag attached, ec_nvlans=%d\n",
-                       ifp->if_xname, ec->ec_nvlans);
-#endif
        }
-#endif
 
        if_percpuq_enqueue(ifp->if_percpuq, m);
 }