From 27137e84eb956fc86433a37cdbd3b1eeb9908894 Mon Sep 17 00:00:00 2001
From: Gao feng <gaofeng@cn.fujitsu.com>
Date: Thu, 31 Jan 2013 16:30:57 +0000
Subject: [PATCH] --- yaml --- r: 352049 b: refs/heads/master c:
 c5c351088ae76b46ae08dec1bb7f621e0721c78b h: refs/heads/master i:   352047:
 7a787aef389a90003ff89ebadc93b365751871a6 v: v3

---
 [refs]                     | 2 +-
 trunk/net/core/rtnetlink.c | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 23199862a6eb..121ffed3c9ca 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4f463855c7d5a0ed0faa62497f3006336e74ee16
+refs/heads/master: c5c351088ae76b46ae08dec1bb7f621e0721c78b
diff --git a/trunk/net/core/rtnetlink.c b/trunk/net/core/rtnetlink.c
index 9a419b099482..c1e4db60eeca 100644
--- a/trunk/net/core/rtnetlink.c
+++ b/trunk/net/core/rtnetlink.c
@@ -2058,9 +2058,6 @@ static int rtnl_fdb_add(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg)
 	u8 *addr;
 	int err;
 
-	if (!capable(CAP_NET_ADMIN))
-		return -EPERM;
-
 	err = nlmsg_parse(nlh, sizeof(*ndm), tb, NDA_MAX, NULL);
 	if (err < 0)
 		return err;
@@ -2127,9 +2124,6 @@ static int rtnl_fdb_del(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg)
 	int err = -EINVAL;
 	__u8 *addr;
 
-	if (!capable(CAP_NET_ADMIN))
-		return -EPERM;
-
 	if (nlmsg_len(nlh) < sizeof(*ndm))
 		return -EINVAL;