libnl/patches/libnl-1.1-vlan-header.patch

From: Patrick McHardy <kaber@trash.net>
Date: Fri, 18 Jan 2008 16:55:48 +0000 (+0100)
Subject: [LIBNL]: Add if_vlan.h
X-Git-Url: http://git.kernel.org/?p=libs%2Fnetlink%2Flibnl.git;a=commitdiff_plain;h=e91bb2ffb090955d443e643a25b250bf3d33534a;hp=7f6b7a8eea0334b34d58dec72c66121a76f08958

[LIBNL]: Add if_vlan.h

vlan support needs VLAN_FLAG_REORDER_HDR, which is not available in
older if_vlan.h versions. Add the current version from the kernel.

Signed-off-by: Patrick McHardy <kaber@trash.net>
---

diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h
new file mode 100644
index 0000000..068cd7b
--- /dev/null
+++ include/linux/if_vlan.h
@@ -0,0 +1,61 @@
+/*
+ * VLAN		An implementation of 802.1Q VLAN tagging.
+ *
+ * Authors:	Ben Greear <greearb@candelatech.com>
+ *
+ *		This program is free software; you can redistribute it and/or
+ *		modify it under the terms of the GNU General Public License
+ *		as published by the Free Software Foundation; either version
+ *		2 of the License, or (at your option) any later version.
+ *
+ */
+
+#ifndef _LINUX_IF_VLAN_H_
+#define _LINUX_IF_VLAN_H_
+
+
+/* VLAN IOCTLs are found in sockios.h */
+
+/* Passed in vlan_ioctl_args structure to determine behaviour. */
+enum vlan_ioctl_cmds {
+	ADD_VLAN_CMD,
+	DEL_VLAN_CMD,
+	SET_VLAN_INGRESS_PRIORITY_CMD,
+	SET_VLAN_EGRESS_PRIORITY_CMD,
+	GET_VLAN_INGRESS_PRIORITY_CMD,
+	GET_VLAN_EGRESS_PRIORITY_CMD,
+	SET_VLAN_NAME_TYPE_CMD,
+	SET_VLAN_FLAG_CMD,
+	GET_VLAN_REALDEV_NAME_CMD, /* If this works, you know it's a VLAN device, btw */
+	GET_VLAN_VID_CMD /* Get the VID of this VLAN (specified by name) */
+};
+
+enum vlan_flags {
+	VLAN_FLAG_REORDER_HDR	= 0x1,
+};
+
+enum vlan_name_types {
+	VLAN_NAME_TYPE_PLUS_VID, /* Name will look like:  vlan0005 */
+	VLAN_NAME_TYPE_RAW_PLUS_VID, /* name will look like:  eth1.0005 */
+	VLAN_NAME_TYPE_PLUS_VID_NO_PAD, /* Name will look like:  vlan5 */
+	VLAN_NAME_TYPE_RAW_PLUS_VID_NO_PAD, /* Name will look like:  eth0.5 */
+	VLAN_NAME_TYPE_HIGHEST
+};
+
+struct vlan_ioctl_args {
+	int cmd; /* Should be one of the vlan_ioctl_cmds enum above. */
+	char device1[24];
+
+        union {
+		char device2[24];
+		int VID;
+		unsigned int skb_priority;
+		unsigned int name_type;
+		unsigned int bind_type;
+		unsigned int flag; /* Matches vlan_dev_info flags */
+        } u;
+
+	short vlan_qos;
+};
+
+#endif /* !(_LINUX_IF_VLAN_H_) */
1	niro	845	From: Patrick McHardy <kaber@trash.net>
2			Date: Fri, 18 Jan 2008 16:55:48 +0000 (+0100)
3			Subject: [LIBNL]: Add if_vlan.h
4			X-Git-Url: http://git.kernel.org/?p=libs%2Fnetlink%2Flibnl.git;a=commitdiff_plain;h=e91bb2ffb090955d443e643a25b250bf3d33534a;hp=7f6b7a8eea0334b34d58dec72c66121a76f08958
5
6			[LIBNL]: Add if_vlan.h
7
8			vlan support needs VLAN_FLAG_REORDER_HDR, which is not available in
9			older if_vlan.h versions. Add the current version from the kernel.
10
11			Signed-off-by: Patrick McHardy <kaber@trash.net>
12			---
13
14			diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h
15			new file mode 100644
16			index 0000000..068cd7b
17			--- /dev/null
18			+++ include/linux/if_vlan.h
19			@@ -0,0 +1,61 @@
20			+/*
21			+ * VLAN An implementation of 802.1Q VLAN tagging.
22			+ *
23			+ * Authors: Ben Greear <greearb@candelatech.com>
24			+ *
25			+ * This program is free software; you can redistribute it and/or
26			+ * modify it under the terms of the GNU General Public License
27			+ * as published by the Free Software Foundation; either version
28			+ * 2 of the License, or (at your option) any later version.
29			+ *
30			+ */
31			+
32			+#ifndef _LINUX_IF_VLAN_H_
33			+#define _LINUX_IF_VLAN_H_
34			+
35			+
36			+/* VLAN IOCTLs are found in sockios.h */
37			+
38			+/* Passed in vlan_ioctl_args structure to determine behaviour. */
39			+enum vlan_ioctl_cmds {
40			+ ADD_VLAN_CMD,
41			+ DEL_VLAN_CMD,
42			+ SET_VLAN_INGRESS_PRIORITY_CMD,
43			+ SET_VLAN_EGRESS_PRIORITY_CMD,
44			+ GET_VLAN_INGRESS_PRIORITY_CMD,
45			+ GET_VLAN_EGRESS_PRIORITY_CMD,
46			+ SET_VLAN_NAME_TYPE_CMD,
47			+ SET_VLAN_FLAG_CMD,
48			+ GET_VLAN_REALDEV_NAME_CMD, /* If this works, you know it's a VLAN device, btw */
49			+ GET_VLAN_VID_CMD /* Get the VID of this VLAN (specified by name) */
50			+};
51			+
52			+enum vlan_flags {
53			+ VLAN_FLAG_REORDER_HDR = 0x1,
54			+};
55			+
56			+enum vlan_name_types {
57			+ VLAN_NAME_TYPE_PLUS_VID, /* Name will look like: vlan0005 */
58			+ VLAN_NAME_TYPE_RAW_PLUS_VID, /* name will look like: eth1.0005 */
59			+ VLAN_NAME_TYPE_PLUS_VID_NO_PAD, /* Name will look like: vlan5 */
60			+ VLAN_NAME_TYPE_RAW_PLUS_VID_NO_PAD, /* Name will look like: eth0.5 */
61			+ VLAN_NAME_TYPE_HIGHEST
62			+};
63			+
64			+struct vlan_ioctl_args {
65			+ int cmd; /* Should be one of the vlan_ioctl_cmds enum above. */
66			+ char device1[24];
67			+
68			+ union {
69			+ char device2[24];
70			+ int VID;
71			+ unsigned int skb_priority;
72			+ unsigned int name_type;
73			+ unsigned int bind_type;
74			+ unsigned int flag; /* Matches vlan_dev_info flags */
75			+ } u;
76			+
77			+ short vlan_qos;
78			+};
79			+
80			+#endif /* !(_LINUX_IF_VLAN_H_) */