diff options
Diffstat (limited to 'net/sched/sch_sfq.c')
-rw-r--r-- | net/sched/sch_sfq.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/sched/sch_sfq.c b/net/sched/sch_sfq.c index 25afe0f1d83a..91af539ab6e6 100644 --- a/net/sched/sch_sfq.c +++ b/net/sched/sch_sfq.c | |||
@@ -397,13 +397,13 @@ static void sfq_perturbation(unsigned long arg) | |||
397 | mod_timer(&q->perturb_timer, jiffies + q->perturb_period); | 397 | mod_timer(&q->perturb_timer, jiffies + q->perturb_period); |
398 | } | 398 | } |
399 | 399 | ||
400 | static int sfq_change(struct Qdisc *sch, struct rtattr *opt) | 400 | static int sfq_change(struct Qdisc *sch, struct nlattr *opt) |
401 | { | 401 | { |
402 | struct sfq_sched_data *q = qdisc_priv(sch); | 402 | struct sfq_sched_data *q = qdisc_priv(sch); |
403 | struct tc_sfq_qopt *ctl = RTA_DATA(opt); | 403 | struct tc_sfq_qopt *ctl = nla_data(opt); |
404 | unsigned int qlen; | 404 | unsigned int qlen; |
405 | 405 | ||
406 | if (opt->rta_len < RTA_LENGTH(sizeof(*ctl))) | 406 | if (opt->nla_len < nla_attr_size(sizeof(*ctl))) |
407 | return -EINVAL; | 407 | return -EINVAL; |
408 | 408 | ||
409 | sch_tree_lock(sch); | 409 | sch_tree_lock(sch); |
@@ -426,7 +426,7 @@ static int sfq_change(struct Qdisc *sch, struct rtattr *opt) | |||
426 | return 0; | 426 | return 0; |
427 | } | 427 | } |
428 | 428 | ||
429 | static int sfq_init(struct Qdisc *sch, struct rtattr *opt) | 429 | static int sfq_init(struct Qdisc *sch, struct nlattr *opt) |
430 | { | 430 | { |
431 | struct sfq_sched_data *q = qdisc_priv(sch); | 431 | struct sfq_sched_data *q = qdisc_priv(sch); |
432 | int i; | 432 | int i; |
@@ -481,11 +481,11 @@ static int sfq_dump(struct Qdisc *sch, struct sk_buff *skb) | |||
481 | opt.divisor = SFQ_HASH_DIVISOR; | 481 | opt.divisor = SFQ_HASH_DIVISOR; |
482 | opt.flows = q->limit; | 482 | opt.flows = q->limit; |
483 | 483 | ||
484 | RTA_PUT(skb, TCA_OPTIONS, sizeof(opt), &opt); | 484 | NLA_PUT(skb, TCA_OPTIONS, sizeof(opt), &opt); |
485 | 485 | ||
486 | return skb->len; | 486 | return skb->len; |
487 | 487 | ||
488 | rtattr_failure: | 488 | nla_put_failure: |
489 | nlmsg_trim(skb, b); | 489 | nlmsg_trim(skb, b); |
490 | return -1; | 490 | return -1; |
491 | } | 491 | } |