From owner-svn-src-all@freebsd.org  Sat Sep 16 02:10:37 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id E168CE1BA8E;
 Sat, 16 Sep 2017 02:10:37 +0000 (UTC)
 (envelope-from mjoras@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id B09522024;
 Sat, 16 Sep 2017 02:10:37 +0000 (UTC)
 (envelope-from mjoras@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8G2AaFu094062;
 Sat, 16 Sep 2017 02:10:36 GMT (envelope-from mjoras@FreeBSD.org)
Received: (from mjoras@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8G2Aagv094061;
 Sat, 16 Sep 2017 02:10:36 GMT (envelope-from mjoras@FreeBSD.org)
Message-Id: <201709160210.v8G2Aagv094061@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mjoras set sender to
 mjoras@FreeBSD.org using -f
From: Matt Joras <mjoras@FreeBSD.org>
Date: Sat, 16 Sep 2017 02:10:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r323633 - stable/11/sys/net
X-SVN-Group: stable-11
X-SVN-Commit-Author: mjoras
X-SVN-Commit-Paths: stable/11/sys/net
X-SVN-Commit-Revision: 323633
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 16 Sep 2017 02:10:38 -0000

Author: mjoras
Date: Sat Sep 16 02:10:36 2017
New Revision: 323633
URL: https://svnweb.freebsd.org/changeset/base/323633

Log:
  MFC r323513:
  Allow vlan interfaces to rx through netmap(4).

Modified:
  stable/11/sys/net/if_vlan.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/net/if_vlan.c
==============================================================================
--- stable/11/sys/net/if_vlan.c	Fri Sep 15 22:56:39 2017	(r323632)
+++ stable/11/sys/net/if_vlan.c	Sat Sep 16 02:10:36 2017	(r323633)
@@ -1376,7 +1376,7 @@ vlan_input(struct ifnet *ifp, struct mbuf *m)
 	VLAN_RUNLOCK();
 
 	/* Pass it back through the parent's input routine. */
-	(*ifp->if_input)(ifv->ifv_ifp, m);
+	(*ifv->ifv_ifp->if_input)(ifv->ifv_ifp, m);
 }
 
 static void