From 8c105815043cfebf0c25bd9a2a23ccc88dfa58da Mon Sep 17 00:00:00 2001
From: John Fastabend <john.fastabend@gmail.com>
Date: Sun, 9 Dec 2012 20:48:13 +0000
Subject: [PATCH] --- yaml --- r: 342063 b: refs/heads/master c:
 7c77ab24e30bad7598b5cfda93be6f32ed439c2f h: refs/heads/master i:   342061:
 844d2d518579036451137f36d1f461216039b616   342059:
 a7857cef0a1f73dc5603ed128a5344bc9d472212   342055:
 532e9342e9435b3d32bc84fc0007c9b826577a47   342047:
 644a3c9beacda690858889fb5146c524687b3836 v: v3

---
 [refs]                | 2 +-
 trunk/net/dcb/dcbnl.c | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index e7659d756e54..294984803ae9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7b9e75802f1c50bfeae53c86c0bfbc5c45fd8719
+refs/heads/master: 7c77ab24e30bad7598b5cfda93be6f32ed439c2f
diff --git a/trunk/net/dcb/dcbnl.c b/trunk/net/dcb/dcbnl.c
index b07c75d37e91..1b588e23cf80 100644
--- a/trunk/net/dcb/dcbnl.c
+++ b/trunk/net/dcb/dcbnl.c
@@ -1665,9 +1665,6 @@ static int dcb_doit(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg)
 	if ((nlh->nlmsg_type == RTM_SETDCB) && !capable(CAP_NET_ADMIN))
 		return -EPERM;
 
-	if (!net_eq(net, &init_net))
-		return -EINVAL;
-
 	ret = nlmsg_parse(nlh, sizeof(*dcb), tb, DCB_ATTR_MAX,
 			  dcbnl_rtnl_policy);
 	if (ret < 0)
@@ -1684,7 +1681,7 @@ static int dcb_doit(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg)
 	if (!tb[DCB_ATTR_IFNAME])
 		return -EINVAL;
 
-	netdev = dev_get_by_name(&init_net, nla_data(tb[DCB_ATTR_IFNAME]));
+	netdev = dev_get_by_name(net, nla_data(tb[DCB_ATTR_IFNAME]));
 	if (!netdev)
 		return -ENODEV;
 
@@ -1708,7 +1705,7 @@ static int dcb_doit(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg)
 
 	nlmsg_end(reply_skb, reply_nlh);
 
-	ret = rtnl_unicast(reply_skb, &init_net, portid);
+	ret = rtnl_unicast(reply_skb, net, portid);
 out:
 	dev_put(netdev);
 	return ret;