diff options
Diffstat (limited to 'net/sched/cls_route.c')
-rw-r--r-- | net/sched/cls_route.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/net/sched/cls_route.c b/net/sched/cls_route.c index c10d57bf98f2..37da567d833e 100644 --- a/net/sched/cls_route.c +++ b/net/sched/cls_route.c | |||
@@ -335,9 +335,10 @@ static const struct nla_policy route4_policy[TCA_ROUTE4_MAX + 1] = { | |||
335 | [TCA_ROUTE4_IIF] = { .type = NLA_U32 }, | 335 | [TCA_ROUTE4_IIF] = { .type = NLA_U32 }, |
336 | }; | 336 | }; |
337 | 337 | ||
338 | static int route4_set_parms(struct tcf_proto *tp, unsigned long base, | 338 | static int route4_set_parms(struct net *net, struct tcf_proto *tp, |
339 | struct route4_filter *f, u32 handle, struct route4_head *head, | 339 | unsigned long base, struct route4_filter *f, |
340 | struct nlattr **tb, struct nlattr *est, int new) | 340 | u32 handle, struct route4_head *head, |
341 | struct nlattr **tb, struct nlattr *est, int new) | ||
341 | { | 342 | { |
342 | int err; | 343 | int err; |
343 | u32 id = 0, to = 0, nhandle = 0x8000; | 344 | u32 id = 0, to = 0, nhandle = 0x8000; |
@@ -346,7 +347,7 @@ static int route4_set_parms(struct tcf_proto *tp, unsigned long base, | |||
346 | struct route4_bucket *b; | 347 | struct route4_bucket *b; |
347 | struct tcf_exts e; | 348 | struct tcf_exts e; |
348 | 349 | ||
349 | err = tcf_exts_validate(tp, tb, est, &e, &route_ext_map); | 350 | err = tcf_exts_validate(net, tp, tb, est, &e, &route_ext_map); |
350 | if (err < 0) | 351 | if (err < 0) |
351 | return err; | 352 | return err; |
352 | 353 | ||
@@ -427,7 +428,7 @@ errout: | |||
427 | return err; | 428 | return err; |
428 | } | 429 | } |
429 | 430 | ||
430 | static int route4_change(struct sk_buff *in_skb, | 431 | static int route4_change(struct net *net, struct sk_buff *in_skb, |
431 | struct tcf_proto *tp, unsigned long base, | 432 | struct tcf_proto *tp, unsigned long base, |
432 | u32 handle, | 433 | u32 handle, |
433 | struct nlattr **tca, | 434 | struct nlattr **tca, |
@@ -457,7 +458,7 @@ static int route4_change(struct sk_buff *in_skb, | |||
457 | if (f->bkt) | 458 | if (f->bkt) |
458 | old_handle = f->handle; | 459 | old_handle = f->handle; |
459 | 460 | ||
460 | err = route4_set_parms(tp, base, f, handle, head, tb, | 461 | err = route4_set_parms(net, tp, base, f, handle, head, tb, |
461 | tca[TCA_RATE], 0); | 462 | tca[TCA_RATE], 0); |
462 | if (err < 0) | 463 | if (err < 0) |
463 | return err; | 464 | return err; |
@@ -480,7 +481,7 @@ static int route4_change(struct sk_buff *in_skb, | |||
480 | if (f == NULL) | 481 | if (f == NULL) |
481 | goto errout; | 482 | goto errout; |
482 | 483 | ||
483 | err = route4_set_parms(tp, base, f, handle, head, tb, | 484 | err = route4_set_parms(net, tp, base, f, handle, head, tb, |
484 | tca[TCA_RATE], 1); | 485 | tca[TCA_RATE], 1); |
485 | if (err < 0) | 486 | if (err < 0) |
486 | goto errout; | 487 | goto errout; |