From 03deb6dd5bcabf470fdde437e704887b4ee9dea9 Mon Sep 17 00:00:00 2001
From: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Date: Thu, 25 Oct 2012 22:28:49 +0000
Subject: [PATCH] --- yaml --- r: 340509 b: refs/heads/master c:
 d900082bd9060dc955b181dae2f2adf86e27d747 h: refs/heads/master i:   340507:
 1a0a82ae313a703e934fe1b45c5cbf624cd9615e v: v3

---
 [refs]                               |  2 +-
 trunk/include/uapi/linux/netconf.h   | 22 ++++++++++++++++++++++
 trunk/include/uapi/linux/rtnetlink.h |  5 +++++
 3 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 trunk/include/uapi/linux/netconf.h

diff --git a/[refs] b/[refs]
index c8e99058e707..d74121b6f97d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f019948dbb388eacbc0fb61db1d30e686224df77
+refs/heads/master: d900082bd9060dc955b181dae2f2adf86e27d747
diff --git a/trunk/include/uapi/linux/netconf.h b/trunk/include/uapi/linux/netconf.h
new file mode 100644
index 000000000000..d0513726711f
--- /dev/null
+++ b/trunk/include/uapi/linux/netconf.h
@@ -0,0 +1,22 @@
+#ifndef _UAPI_LINUX_NETCONF_H_
+#define _UAPI_LINUX_NETCONF_H_
+
+#include <linux/types.h>
+#include <linux/netlink.h>
+
+struct netconfmsg {
+	__u8	ncm_family;
+};
+
+enum {
+	NETCONFA_UNSPEC,
+	NETCONFA_IFINDEX,
+	NETCONFA_FORWARDING,
+	__NETCONFA_MAX
+};
+#define NETCONFA_MAX	(__NETCONFA_MAX - 1)
+
+#define NETCONFA_IFINDEX_ALL		-1
+#define NETCONFA_IFINDEX_DEFAULT	-2
+
+#endif /* _UAPI_LINUX_NETCONF_H_ */
diff --git a/trunk/include/uapi/linux/rtnetlink.h b/trunk/include/uapi/linux/rtnetlink.h
index fcd768b09f6e..0043b413b8bc 100644
--- a/trunk/include/uapi/linux/rtnetlink.h
+++ b/trunk/include/uapi/linux/rtnetlink.h
@@ -120,6 +120,11 @@ enum {
 	RTM_SETDCB,
 #define RTM_SETDCB RTM_SETDCB
 
+	RTM_NEWNETCONF = 80,
+#define RTM_NEWNETCONF RTM_NEWNETCONF
+	RTM_GETNETCONF = 82,
+#define RTM_GETNETCONF RTM_GETNETCONF
+
 	__RTM_MAX,
 #define RTM_MAX		(((__RTM_MAX + 3) & ~3) - 1)
 };