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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
net
/
sched
/
cls_basic.c
diff --git
a/net/sched/cls_basic.c
b/net/sched/cls_basic.c
index
0f42544
..
23e4459
100644
(file)
--- a/
net/sched/cls_basic.c
+++ b/
net/sched/cls_basic.c
@@
-9,7
+9,6
@@
* Authors: Thomas Graf <tgraf@suug.ch>
*/
* Authors: Thomas Graf <tgraf@suug.ch>
*/
-#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>
@@
-83,6
+82,13
@@
static void basic_put(struct tcf_proto *tp, unsigned long f)
static int basic_init(struct tcf_proto *tp)
{
static int basic_init(struct tcf_proto *tp)
{
+ struct basic_head *head;
+
+ head = kzalloc(sizeof(*head), GFP_KERNEL);
+ if (head == NULL)
+ return -ENOBUFS;
+ INIT_LIST_HEAD(&head->flist);
+ tp->root = head;
return 0;
}
return 0;
}
@@
-178,20
+184,9
@@
static int basic_change(struct tcf_proto *tp, unsigned long base, u32 handle,
}
err = -ENOBUFS;
}
err = -ENOBUFS;
- if (head == NULL) {
- head = kmalloc(sizeof(*head), GFP_KERNEL);
- if (head == NULL)
- goto errout;
-
- memset(head, 0, sizeof(*head));
- INIT_LIST_HEAD(&head->flist);
- tp->root = head;
- }
-
- f = kmalloc(sizeof(*f), GFP_KERNEL);
+ f = kzalloc(sizeof(*f), GFP_KERNEL);
if (f == NULL)
goto errout;
if (f == NULL)
goto errout;
- memset(f, 0, sizeof(*f));
err = -EINVAL;
if (handle)
err = -EINVAL;
if (handle)