diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-29 00:24:32 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-29 00:24:32 -0400 |
| commit | a839688362e32f01608838516036697e30618b39 (patch) | |
| tree | a174d93d568ba9735b13bb6ebb5f1a36c8f56308 /net/sched/sch_api.c | |
| parent | 2fa938b8a3964c21b23d9d095091e7abc88249c5 (diff) | |
| parent | 12dc2fdd3e6067f5137e4a6d8af0b1a994952f52 (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/sched/sch_api.c')
| -rw-r--r-- | net/sched/sch_api.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c index 97c1c75d5c78..05e6e0a799da 100644 --- a/net/sched/sch_api.c +++ b/net/sched/sch_api.c | |||
| @@ -770,6 +770,8 @@ static int tc_fill_qdisc(struct sk_buff *skb, struct Qdisc *q, u32 clid, | |||
| 770 | nlh = NLMSG_NEW(skb, pid, seq, event, sizeof(*tcm), flags); | 770 | nlh = NLMSG_NEW(skb, pid, seq, event, sizeof(*tcm), flags); |
| 771 | tcm = NLMSG_DATA(nlh); | 771 | tcm = NLMSG_DATA(nlh); |
| 772 | tcm->tcm_family = AF_UNSPEC; | 772 | tcm->tcm_family = AF_UNSPEC; |
| 773 | tcm->tcm__pad1 = 0; | ||
| 774 | tcm->tcm__pad2 = 0; | ||
| 773 | tcm->tcm_ifindex = q->dev->ifindex; | 775 | tcm->tcm_ifindex = q->dev->ifindex; |
| 774 | tcm->tcm_parent = clid; | 776 | tcm->tcm_parent = clid; |
| 775 | tcm->tcm_handle = q->handle; | 777 | tcm->tcm_handle = q->handle; |