git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
net
/
sched
/
sch_gred.c
diff --git
a/net/sched/sch_gred.c
b/net/sched/sch_gred.c
index
29a2dd9
..
18e81a8
100644
(file)
--- a/
net/sched/sch_gred.c
+++ b/
net/sched/sch_gred.c
@@
-18,7
+18,6
@@
* For all the glorious comments look at include/net/red.h
*/
* For all the glorious comments look at include/net/red.h
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/kernel.h>
@@
-407,10
+406,9
@@
static inline int gred_change_vq(struct Qdisc *sch, int dp,
struct gred_sched_data *q;
if (table->tab[dp] == NULL) {
struct gred_sched_data *q;
if (table->tab[dp] == NULL) {
- table->tab[dp] = k
m
alloc(sizeof(*q), GFP_KERNEL);
+ table->tab[dp] = k
z
alloc(sizeof(*q), GFP_KERNEL);
if (table->tab[dp] == NULL)
return -ENOMEM;
if (table->tab[dp] == NULL)
return -ENOMEM;
- memset(table->tab[dp], 0, sizeof(*q));
}
q = table->tab[dp];
}
q = table->tab[dp];