From owner-svn-src-head@freebsd.org  Tue Jan 26 14:33:22 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 5175EA46115;
 Tue, 26 Jan 2016 14:33:22 +0000 (UTC)
 (envelope-from hselasky@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 23BEF21D;
 Tue, 26 Jan 2016 14:33:22 +0000 (UTC)
 (envelope-from hselasky@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0QEXLrP048156;
 Tue, 26 Jan 2016 14:33:21 GMT (envelope-from hselasky@FreeBSD.org)
Received: (from hselasky@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0QEXL8N048155;
 Tue, 26 Jan 2016 14:33:21 GMT (envelope-from hselasky@FreeBSD.org)
Message-Id: <201601261433.u0QEXL8N048155@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: hselasky set sender to
 hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
Date: Tue, 26 Jan 2016 14:33:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r294830 - head/sys/compat/linuxkpi/common/include/linux
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 26 Jan 2016 14:33:22 -0000

Author: hselasky
Date: Tue Jan 26 14:33:20 2016
New Revision: 294830
URL: https://svnweb.freebsd.org/changeset/base/294830

Log:
  Implement is_vlan_dev() and vlan_dev_vlan_id() for the LinuxKPI.
  
  MFC after:	1 week
  Sponsored by:	Mellanox Technologies

Modified:
  head/sys/compat/linuxkpi/common/include/linux/if_vlan.h

Modified: head/sys/compat/linuxkpi/common/include/linux/if_vlan.h
==============================================================================
--- head/sys/compat/linuxkpi/common/include/linux/if_vlan.h	Tue Jan 26 14:31:20 2016	(r294829)
+++ head/sys/compat/linuxkpi/common/include/linux/if_vlan.h	Tue Jan 26 14:33:20 2016	(r294830)
@@ -2,7 +2,7 @@
  * Copyright (c) 2010 Isilon Systems, Inc.
  * Copyright (c) 2010 iX Systems, Inc.
  * Copyright (c) 2010 Panasas, Inc.
- * Copyright (c) 2013 Mellanox Technologies, Ltd.
+ * Copyright (c) 2013-2016 Mellanox Technologies, Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -35,8 +35,25 @@
 #include <sys/socket.h>
 #include <net/if.h>
 #include <net/ethernet.h>
+#include <net/if_var.h>
 #include <net/if_vlan_var.h>
+#include <net/if_types.h>
 
 #define VLAN_N_VID              4096
 
+static inline int
+is_vlan_dev(struct ifnet *ifp)
+{
+	return (ifp->if_type == IFT_L2VLAN);
+}
+
+static inline uint16_t
+vlan_dev_vlan_id(struct ifnet *ifp)
+{
+	uint16_t vtag;
+	if (VLAN_TAG(ifp, &vtag) == 0)
+		return (vtag);
+	return (0);
+}
+
 #endif	/* _LINUX_IF_VLAN_H_ */