X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=net%2Fsched%2Fem_meta.c;h=700844d49d795d36acffd22815b5fb4f15ec3ce9;hb=9464c7cf61b9433057924c36e6e02f303a00e768;hp=61e3b740ab1a9b434cfc0a79955a5880e134826f;hpb=41689045f6a3cbe0550e1d34e9cc20d2e8c432ba;p=linux-2.6.git

diff --git a/net/sched/em_meta.c b/net/sched/em_meta.c
index 61e3b740a..700844d49 100644
--- a/net/sched/em_meta.c
+++ b/net/sched/em_meta.c
@@ -58,6 +58,7 @@
  * 	      only available if that subsytem is enabled in the kernel.
  */
 
+#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
@@ -773,9 +774,10 @@ static int em_meta_change(struct tcf_proto *tp, void *data, int len,
 	    TCF_META_ID(hdr->right.kind) > TCF_META_ID_MAX)
 		goto errout;
 
-	meta = kzalloc(sizeof(*meta), GFP_KERNEL);
+	meta = kmalloc(sizeof(*meta), GFP_KERNEL);
 	if (meta == NULL)
 		goto errout;
+	memset(meta, 0, sizeof(*meta));
 
 	memcpy(&meta->lvalue.hdr, &hdr->left, sizeof(hdr->left));
 	memcpy(&meta->rvalue.hdr, &hdr->right, sizeof(hdr->right));