diff options
| author | John Fastabend <john.fastabend@gmail.com> | 2012-12-09 20:48:13 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-12-10 14:09:01 -0500 |
| commit | 7c77ab24e30bad7598b5cfda93be6f32ed439c2f (patch) | |
| tree | f806a2e6f510d5e206e3bb85cb8732a310a4ea09 /net | |
| parent | 7b9e75802f1c50bfeae53c86c0bfbc5c45fd8719 (diff) | |
| download | op-kernel-dev-7c77ab24e30bad7598b5cfda93be6f32ed439c2f.zip op-kernel-dev-7c77ab24e30bad7598b5cfda93be6f32ed439c2f.tar.gz | |
net: Allow DCBnl to use other namespaces besides init_net
Allow DCB and net namespace to work together. This is useful if you
have containers that are bound to 'phys' interfaces that want to
also manage their DCB attributes.
The net namespace is taken from sock_net(skb->sk) of the netlink skb.
CC: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: John Fastabend <john.r.fastabend@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/dcb/dcbnl.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/net/dcb/dcbnl.c b/net/dcb/dcbnl.c index b07c75d..1b588e2 100644 --- a/net/dcb/dcbnl.c +++ b/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; |
