diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-11 14:38:13 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-11 14:38:13 -0500 |
commit | cb18eccff48ef3986d1072964590bce6fec705fb (patch) | |
tree | 777fb1d15e0281341e1e02c9803d989538d346f2 /net/sched/sch_gred.c | |
parent | c827ba4cb49a30ce581201fd0ba2be77cde412c7 (diff) | |
parent | 5ef213f6842277ee1df5659f59fac0ffc9beb411 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (45 commits)
[IPV4]: Restore multipath routing after rt_next changes.
[XFRM] IPV6: Fix outbound RO transformation which is broken by IPsec tunnel patch.
[NET]: Reorder fields of struct dst_entry
[DECNET]: Convert decnet route to use the new dst_entry 'next' pointer
[IPV6]: Convert ipv6 route to use the new dst_entry 'next' pointer
[IPV4]: Convert ipv4 route to use the new dst_entry 'next' pointer
[NET]: Introduce union in struct dst_entry to hold 'next' pointer
[DECNET]: fix misannotation of linkinfo_dn
[DECNET]: FRA_{DST,SRC} are le16 for decnet
[UDP]: UDP can use sk_hash to speedup lookups
[NET]: Fix whitespace errors.
[NET] XFRM: Fix whitespace errors.
[NET] X25: Fix whitespace errors.
[NET] WANROUTER: Fix whitespace errors.
[NET] UNIX: Fix whitespace errors.
[NET] TIPC: Fix whitespace errors.
[NET] SUNRPC: Fix whitespace errors.
[NET] SCTP: Fix whitespace errors.
[NET] SCHED: Fix whitespace errors.
[NET] RXRPC: Fix whitespace errors.
...
Diffstat (limited to 'net/sched/sch_gred.c')
-rw-r--r-- | net/sched/sch_gred.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sched/sch_gred.c b/net/sched/sch_gred.c index 18e81a8ffb0..fa1b4fe7a5f 100644 --- a/net/sched/sch_gred.c +++ b/net/sched/sch_gred.c | |||
@@ -335,7 +335,7 @@ static void gred_reset(struct Qdisc* sch) | |||
335 | 335 | ||
336 | qdisc_reset_queue(sch); | 336 | qdisc_reset_queue(sch); |
337 | 337 | ||
338 | for (i = 0; i < t->DPs; i++) { | 338 | for (i = 0; i < t->DPs; i++) { |
339 | struct gred_sched_data *q = t->tab[i]; | 339 | struct gred_sched_data *q = t->tab[i]; |
340 | 340 | ||
341 | if (!q) | 341 | if (!q) |
@@ -393,7 +393,7 @@ static inline int gred_change_table_def(struct Qdisc *sch, struct rtattr *dps) | |||
393 | "shadowed VQ 0x%x\n", i); | 393 | "shadowed VQ 0x%x\n", i); |
394 | gred_destroy_vq(table->tab[i]); | 394 | gred_destroy_vq(table->tab[i]); |
395 | table->tab[i] = NULL; | 395 | table->tab[i] = NULL; |
396 | } | 396 | } |
397 | } | 397 | } |
398 | 398 | ||
399 | return 0; | 399 | return 0; |