From 47b4793609c132505a19019ba8bd7c4ddfa0eb27 Mon Sep 17 00:00:00 2001
From: Thomas Graf <tgraf@suug.ch>
Date: Tue, 19 Feb 2008 16:12:08 -0800
Subject: [PATCH] --- yaml --- r: 86267 b: refs/heads/master c:
 76e87306c2de2a581ec939cf9c97cd18d053f90e h: refs/heads/master i:   86265:
 34329135d738a417b2512e49dac8e1525ada4192   86263:
 5668976c6e2154b4837e35a88b1eccb76acf23dc v: v3

---
 [refs]                     | 2 +-
 trunk/net/core/rtnetlink.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f7cb7192d69e..087a6be1a09a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 12aa343add3eced38a44bdb612b35fdf634d918c
+refs/heads/master: 76e87306c2de2a581ec939cf9c97cd18d053f90e
diff --git a/trunk/net/core/rtnetlink.c b/trunk/net/core/rtnetlink.c
index 61ac8d06292c..e170179cc66f 100644
--- a/trunk/net/core/rtnetlink.c
+++ b/trunk/net/core/rtnetlink.c
@@ -689,10 +689,12 @@ const struct nla_policy ifla_policy[IFLA_MAX+1] = {
 	[IFLA_BROADCAST]	= { .type = NLA_BINARY, .len = MAX_ADDR_LEN },
 	[IFLA_MAP]		= { .len = sizeof(struct rtnl_link_ifmap) },
 	[IFLA_MTU]		= { .type = NLA_U32 },
+	[IFLA_LINK]		= { .type = NLA_U32 },
 	[IFLA_TXQLEN]		= { .type = NLA_U32 },
 	[IFLA_WEIGHT]		= { .type = NLA_U32 },
 	[IFLA_OPERSTATE]	= { .type = NLA_U8 },
 	[IFLA_LINKMODE]		= { .type = NLA_U8 },
+	[IFLA_LINKINFO]		= { .type = NLA_NESTED },
 	[IFLA_NET_NS_PID]	= { .type = NLA_U32 },
 };