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
/
act_police.c
diff --git
a/net/sched/act_police.c
b/net/sched/act_police.c
index
24c348f
..
da905d7
100644
(file)
--- a/
net/sched/act_police.c
+++ b/
net/sched/act_police.c
@@
-13,7
+13,6
@@
#include <asm/uaccess.h>
#include <asm/system.h>
#include <linux/bitops.h>
#include <asm/uaccess.h>
#include <asm/system.h>
#include <linux/bitops.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>
@@
-197,10
+196,9
@@
static int tcf_act_police_locate(struct rtattr *rta, struct rtattr *est,
return ret;
}
return ret;
}
- p = k
m
alloc(sizeof(*p), GFP_KERNEL);
+ p = k
z
alloc(sizeof(*p), GFP_KERNEL);
if (p == NULL)
return -ENOMEM;
if (p == NULL)
return -ENOMEM;
- memset(p, 0, sizeof(*p));
ret = ACT_P_CREATED;
p->refcnt = 1;
ret = ACT_P_CREATED;
p->refcnt = 1;
@@
-430,11
+428,10
@@
struct tcf_police * tcf_police_locate(struct rtattr *rta, struct rtattr *est)
return p;
}
return p;
}
- p = k
m
alloc(sizeof(*p), GFP_KERNEL);
+ p = k
z
alloc(sizeof(*p), GFP_KERNEL);
if (p == NULL)
return NULL;
if (p == NULL)
return NULL;
- memset(p, 0, sizeof(*p));
p->refcnt = 1;
spin_lock_init(&p->lock);
p->stats_lock = &p->lock;
p->refcnt = 1;
spin_lock_init(&p->lock);
p->stats_lock = &p->lock;