diff options
Diffstat (limited to 'net/sched/cls_api.c')
-rw-r--r-- | net/sched/cls_api.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c index ff55ed6c49b2..964f5e4f4b8a 100644 --- a/net/sched/cls_api.c +++ b/net/sched/cls_api.c | |||
@@ -321,7 +321,7 @@ replay: | |||
321 | } | 321 | } |
322 | } | 322 | } |
323 | 323 | ||
324 | err = tp->ops->change(skb, tp, cl, t->tcm_handle, tca, &fh); | 324 | err = tp->ops->change(net, skb, tp, cl, t->tcm_handle, tca, &fh); |
325 | if (err == 0) { | 325 | if (err == 0) { |
326 | if (tp_created) { | 326 | if (tp_created) { |
327 | spin_lock_bh(root_lock); | 327 | spin_lock_bh(root_lock); |
@@ -508,7 +508,7 @@ void tcf_exts_destroy(struct tcf_proto *tp, struct tcf_exts *exts) | |||
508 | } | 508 | } |
509 | EXPORT_SYMBOL(tcf_exts_destroy); | 509 | EXPORT_SYMBOL(tcf_exts_destroy); |
510 | 510 | ||
511 | int tcf_exts_validate(struct tcf_proto *tp, struct nlattr **tb, | 511 | int tcf_exts_validate(struct net *net, struct tcf_proto *tp, struct nlattr **tb, |
512 | struct nlattr *rate_tlv, struct tcf_exts *exts, | 512 | struct nlattr *rate_tlv, struct tcf_exts *exts, |
513 | const struct tcf_ext_map *map) | 513 | const struct tcf_ext_map *map) |
514 | { | 514 | { |
@@ -519,7 +519,7 @@ int tcf_exts_validate(struct tcf_proto *tp, struct nlattr **tb, | |||
519 | struct tc_action *act; | 519 | struct tc_action *act; |
520 | 520 | ||
521 | if (map->police && tb[map->police]) { | 521 | if (map->police && tb[map->police]) { |
522 | act = tcf_action_init_1(tb[map->police], rate_tlv, | 522 | act = tcf_action_init_1(net, tb[map->police], rate_tlv, |
523 | "police", TCA_ACT_NOREPLACE, | 523 | "police", TCA_ACT_NOREPLACE, |
524 | TCA_ACT_BIND); | 524 | TCA_ACT_BIND); |
525 | if (IS_ERR(act)) | 525 | if (IS_ERR(act)) |
@@ -528,8 +528,9 @@ int tcf_exts_validate(struct tcf_proto *tp, struct nlattr **tb, | |||
528 | act->type = TCA_OLD_COMPAT; | 528 | act->type = TCA_OLD_COMPAT; |
529 | exts->action = act; | 529 | exts->action = act; |
530 | } else if (map->action && tb[map->action]) { | 530 | } else if (map->action && tb[map->action]) { |
531 | act = tcf_action_init(tb[map->action], rate_tlv, NULL, | 531 | act = tcf_action_init(net, tb[map->action], rate_tlv, |
532 | TCA_ACT_NOREPLACE, TCA_ACT_BIND); | 532 | NULL, TCA_ACT_NOREPLACE, |
533 | TCA_ACT_BIND); | ||
533 | if (IS_ERR(act)) | 534 | if (IS_ERR(act)) |
534 | return PTR_ERR(act); | 535 | return PTR_ERR(act); |
535 | 536 | ||