---

yaml --- r: 352049 b: refs/heads/master c: c5c3510 h: refs/heads/master i: 352047: 7a787ae v: v3
git-mirror · Feb 4, 2013 · 27137e8 · 27137e8
1 parent 84e2837
commit 27137e8
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git 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
@@ -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;