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
Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...
[linux-2.6.git]
/
net
/
ipv4
/
ipvs
/
ip_vs_est.c
diff --git
a/net/ipv4/ipvs/ip_vs_est.c
b/net/ipv4/ipvs/ip_vs_est.c
index
7d68b80
..
c453e1e
100644
(file)
--- a/
net/ipv4/ipvs/ip_vs_est.c
+++ b/
net/ipv4/ipvs/ip_vs_est.c
@@
-13,6
+13,7
@@
* Changes:
*
*/
* Changes:
*
*/
+#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/jiffies.h>
#include <linux/slab.h>
#include <linux/kernel.h>
#include <linux/jiffies.h>
#include <linux/slab.h>
@@
-123,10
+124,11
@@
int ip_vs_new_estimator(struct ip_vs_stats *stats)
{
struct ip_vs_estimator *est;
{
struct ip_vs_estimator *est;
- est = k
z
alloc(sizeof(*est), GFP_KERNEL);
+ est = k
m
alloc(sizeof(*est), GFP_KERNEL);
if (est == NULL)
return -ENOMEM;
if (est == NULL)
return -ENOMEM;
+ memset(est, 0, sizeof(*est));
est->stats = stats;
est->last_conns = stats->conns;
est->cps = stats->cps<<10;
est->stats = stats;
est->last_conns = stats->conns;
est->cps = stats->cps<<10;