diff options
| author | David S. Miller <davem@davemloft.net> | 2009-10-12 02:15:47 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-10-12 02:15:47 -0400 |
| commit | 7fe13c5733790ef582769a54693fa6a5abf3c032 (patch) | |
| tree | 567eb4394b642ddc81ff05521329d75d1cf47b88 /net/sched | |
| parent | 8aa0f64ac3835a6daf84d0b0e07c4c01d7d8eddc (diff) | |
| parent | 10c435f18b8cb78a5870c08d52955594f5ec9c31 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/sched')
| -rw-r--r-- | net/sched/cls_api.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c index 6a536949cdc0..7cf6c0fbc7a6 100644 --- a/net/sched/cls_api.c +++ b/net/sched/cls_api.c | |||
| @@ -350,7 +350,7 @@ static int tcf_fill_node(struct sk_buff *skb, struct tcf_proto *tp, | |||
| 350 | tcm = NLMSG_DATA(nlh); | 350 | tcm = NLMSG_DATA(nlh); |
| 351 | tcm->tcm_family = AF_UNSPEC; | 351 | tcm->tcm_family = AF_UNSPEC; |
| 352 | tcm->tcm__pad1 = 0; | 352 | tcm->tcm__pad1 = 0; |
| 353 | tcm->tcm__pad1 = 0; | 353 | tcm->tcm__pad2 = 0; |
| 354 | tcm->tcm_ifindex = qdisc_dev(tp->q)->ifindex; | 354 | tcm->tcm_ifindex = qdisc_dev(tp->q)->ifindex; |
| 355 | tcm->tcm_parent = tp->classid; | 355 | tcm->tcm_parent = tp->classid; |
| 356 | tcm->tcm_info = TC_H_MAKE(tp->prio, tp->protocol); | 356 | tcm->tcm_info = TC_H_MAKE(tp->prio, tp->protocol); |