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 Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
net
/
sched
/
estimator.c
diff --git
a/net/sched/estimator.c
b/net/sched/estimator.c
index
5d3ae03
..
0ebc98e
100644
(file)
--- a/
net/sched/estimator.c
+++ b/
net/sched/estimator.c
@@
-139,11
+139,10
@@
int qdisc_new_estimator(struct tc_stats *stats, spinlock_t *stats_lock, struct r
if (parm->interval < -2 || parm->interval > 3)
return -EINVAL;
if (parm->interval < -2 || parm->interval > 3)
return -EINVAL;
- est = k
m
alloc(sizeof(*est), GFP_KERNEL);
+ est = k
z
alloc(sizeof(*est), GFP_KERNEL);
if (est == NULL)
return -ENOBUFS;
if (est == NULL)
return -ENOBUFS;
- memset(est, 0, sizeof(*est));
est->interval = parm->interval + 2;
est->stats = stats;
est->stats_lock = stats_lock;
est->interval = parm->interval + 2;
est->stats = stats;
est->stats_lock = stats_lock;