git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[NET]: Conversions from kmalloc+memset to k(z|c)alloc.
[safe/jmp/linux-2.6]
/
net
/
sched
/
cls_route.c
diff --git
a/net/sched/cls_route.c
b/net/sched/cls_route.c
index
c2e7190
..
d3aea73
100644
(file)
--- a/
net/sched/cls_route.c
+++ b/
net/sched/cls_route.c
@@
-396,10
+396,9
@@
static int route4_set_parms(struct tcf_proto *tp, unsigned long base,
h1 = to_hash(nhandle);
if ((b = head->table[h1]) == NULL) {
err = -ENOBUFS;
h1 = to_hash(nhandle);
if ((b = head->table[h1]) == NULL) {
err = -ENOBUFS;
- b = k
m
alloc(sizeof(struct route4_bucket), GFP_KERNEL);
+ b = k
z
alloc(sizeof(struct route4_bucket), GFP_KERNEL);
if (b == NULL)
goto errout;
if (b == NULL)
goto errout;
- memset(b, 0, sizeof(*b));
tcf_tree_lock(tp);
head->table[h1] = b;
tcf_tree_lock(tp);
head->table[h1] = b;
@@
-475,20
+474,18
@@
static int route4_change(struct tcf_proto *tp, unsigned long base,
err = -ENOBUFS;
if (head == NULL) {
err = -ENOBUFS;
if (head == NULL) {
- head = k
m
alloc(sizeof(struct route4_head), GFP_KERNEL);
+ head = k
z
alloc(sizeof(struct route4_head), GFP_KERNEL);
if (head == NULL)
goto errout;
if (head == NULL)
goto errout;
- memset(head, 0, sizeof(struct route4_head));
tcf_tree_lock(tp);
tp->root = head;
tcf_tree_unlock(tp);
}
tcf_tree_lock(tp);
tp->root = head;
tcf_tree_unlock(tp);
}
- f = k
m
alloc(sizeof(struct route4_filter), GFP_KERNEL);
+ f = k
z
alloc(sizeof(struct route4_filter), GFP_KERNEL);
if (f == NULL)
goto errout;
if (f == NULL)
goto errout;
- memset(f, 0, sizeof(*f));
err = route4_set_parms(tp, base, f, handle, head, tb,
tca[TCA_RATE-1], 1);
err = route4_set_parms(tp, base, f, handle, head, tb,
tca[TCA_RATE-1], 1);