diff options
author | Jonathan Herman <hermanjl@cs.unc.edu> | 2013-01-17 16:15:55 -0500 |
---|---|---|
committer | Jonathan Herman <hermanjl@cs.unc.edu> | 2013-01-17 16:15:55 -0500 |
commit | 8dea78da5cee153b8af9c07a2745f6c55057fe12 (patch) | |
tree | a8f4d49d63b1ecc92f2fddceba0655b2472c5bd9 /net/sched/act_police.c | |
parent | 406089d01562f1e2bf9f089fd7637009ebaad589 (diff) |
Patched in Tegra support.
Diffstat (limited to 'net/sched/act_police.c')
-rw-r--r-- | net/sched/act_police.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/net/sched/act_police.c b/net/sched/act_police.c index a9de23297d4..6fb3f5af0f8 100644 --- a/net/sched/act_police.c +++ b/net/sched/act_police.c | |||
@@ -356,14 +356,11 @@ tcf_act_police_dump(struct sk_buff *skb, struct tc_action *a, int bind, int ref) | |||
356 | opt.rate = police->tcfp_R_tab->rate; | 356 | opt.rate = police->tcfp_R_tab->rate; |
357 | if (police->tcfp_P_tab) | 357 | if (police->tcfp_P_tab) |
358 | opt.peakrate = police->tcfp_P_tab->rate; | 358 | opt.peakrate = police->tcfp_P_tab->rate; |
359 | if (nla_put(skb, TCA_POLICE_TBF, sizeof(opt), &opt)) | 359 | NLA_PUT(skb, TCA_POLICE_TBF, sizeof(opt), &opt); |
360 | goto nla_put_failure; | 360 | if (police->tcfp_result) |
361 | if (police->tcfp_result && | 361 | NLA_PUT_U32(skb, TCA_POLICE_RESULT, police->tcfp_result); |
362 | nla_put_u32(skb, TCA_POLICE_RESULT, police->tcfp_result)) | 362 | if (police->tcfp_ewma_rate) |
363 | goto nla_put_failure; | 363 | NLA_PUT_U32(skb, TCA_POLICE_AVRATE, police->tcfp_ewma_rate); |
364 | if (police->tcfp_ewma_rate && | ||
365 | nla_put_u32(skb, TCA_POLICE_AVRATE, police->tcfp_ewma_rate)) | ||
366 | goto nla_put_failure; | ||
367 | return skb->len; | 364 | return skb->len; |
368 | 365 | ||
369 | nla_put_failure: | 366 | nla_put_failure: |