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 / sched / cls_basic.c

diff --git a/net/sched/cls_basic.c b/net/sched/cls_basic.c
index 09fda68..dfb300b 100644 (file)
--- a/net/sched/cls_basic.c
+++ b/net/sched/cls_basic.c
@@ -9,6 +9,7 @@
  * Authors:    Thomas Graf <tgraf@suug.ch>
  */
 
+#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
@@ -178,23 +179,25 @@ static int basic_change(struct tcf_proto *tp, unsigned long base, u32 handle,
 
        err = -ENOBUFS;
        if (head == NULL) {
-               head = kzalloc(sizeof(*head), GFP_KERNEL);
+               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 = kzalloc(sizeof(*f), GFP_KERNEL);
+       f = kmalloc(sizeof(*f), GFP_KERNEL);
        if (f == NULL)
                goto errout;
+       memset(f, 0, sizeof(*f));
 
        err = -EINVAL;
        if (handle)
                f->handle = handle;
        else {
-               unsigned int i = 0x80000000;
+               int i = 0x80000000;
                do {
                        if (++head->hgenerator == 0x7FFFFFFF)
                                head->hgenerator = 1;