diff options
author | David S. Miller <davem@davemloft.net> | 2010-08-21 23:32:24 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-08-21 23:32:24 -0700 |
commit | d3c6e7ad09cebbad1a3dea077668062136626fd2 (patch) | |
tree | 698022508a8d8c76a5d2cf55e50232079d6b1f42 /net/sched/act_gact.c | |
parent | c3227e546c574172e77616270a16a04eae561b8f (diff) | |
parent | 48d3ff82698cb0094684aed70446e0a5cbb1a4d0 (diff) | |
download | op-kernel-dev-d3c6e7ad09cebbad1a3dea077668062136626fd2.zip op-kernel-dev-d3c6e7ad09cebbad1a3dea077668062136626fd2.tar.gz |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/sched/act_gact.c')
-rw-r--r-- | net/sched/act_gact.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/net/sched/act_gact.c b/net/sched/act_gact.c index 8406c665..c2ed90a 100644 --- a/net/sched/act_gact.c +++ b/net/sched/act_gact.c @@ -152,21 +152,24 @@ static int tcf_gact(struct sk_buff *skb, struct tc_action *a, struct tcf_result static int tcf_gact_dump(struct sk_buff *skb, struct tc_action *a, int bind, int ref) { unsigned char *b = skb_tail_pointer(skb); - struct tc_gact opt; struct tcf_gact *gact = a->priv; + struct tc_gact opt = { + .index = gact->tcf_index, + .refcnt = gact->tcf_refcnt - ref, + .bindcnt = gact->tcf_bindcnt - bind, + .action = gact->tcf_action, + }; struct tcf_t t; - opt.index = gact->tcf_index; - opt.refcnt = gact->tcf_refcnt - ref; - opt.bindcnt = gact->tcf_bindcnt - bind; - opt.action = gact->tcf_action; NLA_PUT(skb, TCA_GACT_PARMS, sizeof(opt), &opt); #ifdef CONFIG_GACT_PROB if (gact->tcfg_ptype) { - struct tc_gact_p p_opt; - p_opt.paction = gact->tcfg_paction; - p_opt.pval = gact->tcfg_pval; - p_opt.ptype = gact->tcfg_ptype; + struct tc_gact_p p_opt = { + .paction = gact->tcfg_paction, + .pval = gact->tcfg_pval, + .ptype = gact->tcfg_ptype, + }; + NLA_PUT(skb, TCA_GACT_PROB, sizeof(p_opt), &p_opt); } #endif |