diff options
Diffstat (limited to 'net/sched/cls_api.c')
| -rw-r--r-- | net/sched/cls_api.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c index 7cf6c0fbc7a6..3725d8fa29db 100644 --- a/net/sched/cls_api.c +++ b/net/sched/cls_api.c | |||
| @@ -137,7 +137,7 @@ static int tc_ctl_tfilter(struct sk_buff *skb, struct nlmsghdr *n, void *arg) | |||
| 137 | int err; | 137 | int err; |
| 138 | int tp_created = 0; | 138 | int tp_created = 0; |
| 139 | 139 | ||
| 140 | if (net != &init_net) | 140 | if (!net_eq(net, &init_net)) |
| 141 | return -EINVAL; | 141 | return -EINVAL; |
| 142 | 142 | ||
| 143 | replay: | 143 | replay: |
| @@ -404,6 +404,7 @@ static int tcf_node_dump(struct tcf_proto *tp, unsigned long n, | |||
| 404 | a->cb->nlh->nlmsg_seq, NLM_F_MULTI, RTM_NEWTFILTER); | 404 | a->cb->nlh->nlmsg_seq, NLM_F_MULTI, RTM_NEWTFILTER); |
| 405 | } | 405 | } |
| 406 | 406 | ||
| 407 | /* called with RTNL */ | ||
| 407 | static int tc_dump_tfilter(struct sk_buff *skb, struct netlink_callback *cb) | 408 | static int tc_dump_tfilter(struct sk_buff *skb, struct netlink_callback *cb) |
| 408 | { | 409 | { |
| 409 | struct net *net = sock_net(skb->sk); | 410 | struct net *net = sock_net(skb->sk); |
| @@ -417,12 +418,12 @@ static int tc_dump_tfilter(struct sk_buff *skb, struct netlink_callback *cb) | |||
| 417 | const struct Qdisc_class_ops *cops; | 418 | const struct Qdisc_class_ops *cops; |
| 418 | struct tcf_dump_args arg; | 419 | struct tcf_dump_args arg; |
| 419 | 420 | ||
| 420 | if (net != &init_net) | 421 | if (!net_eq(net, &init_net)) |
| 421 | return 0; | 422 | return 0; |
| 422 | 423 | ||
| 423 | if (cb->nlh->nlmsg_len < NLMSG_LENGTH(sizeof(*tcm))) | 424 | if (cb->nlh->nlmsg_len < NLMSG_LENGTH(sizeof(*tcm))) |
| 424 | return skb->len; | 425 | return skb->len; |
| 425 | if ((dev = dev_get_by_index(&init_net, tcm->tcm_ifindex)) == NULL) | 426 | if ((dev = __dev_get_by_index(&init_net, tcm->tcm_ifindex)) == NULL) |
| 426 | return skb->len; | 427 | return skb->len; |
| 427 | 428 | ||
| 428 | if (!tcm->tcm_parent) | 429 | if (!tcm->tcm_parent) |
| @@ -484,7 +485,6 @@ errout: | |||
| 484 | if (cl) | 485 | if (cl) |
| 485 | cops->put(q, cl); | 486 | cops->put(q, cl); |
| 486 | out: | 487 | out: |
| 487 | dev_put(dev); | ||
| 488 | return skb->len; | 488 | return skb->len; |
| 489 | } | 489 | } |
| 490 | 490 | ||
