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

---
 [refs]                    | 2 +-
 trunk/net/bridge/br_mdb.c | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index dc1c09a3f0a8..7f2388b37a10 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bb12b8b26e197b21e3f28d5401bfee6f86a8d633
+refs/heads/master: e4d343ea92bdce831f071d9706b2daf097e6d009
diff --git a/trunk/net/bridge/br_mdb.c b/trunk/net/bridge/br_mdb.c
index acc9f4cc18f7..38991e03646d 100644
--- a/trunk/net/bridge/br_mdb.c
+++ b/trunk/net/bridge/br_mdb.c
@@ -272,9 +272,6 @@ static int br_mdb_parse(struct sk_buff *skb, struct nlmsghdr *nlh,
 	struct net_device *dev;
 	int err;
 
-	if (!capable(CAP_NET_ADMIN))
-		return -EPERM;
-
 	err = nlmsg_parse(nlh, sizeof(*bpm), tb, MDBA_SET_ENTRY, NULL);
 	if (err < 0)
 		return err;