diff --git a/[refs] b/[refs]
index 341f5f9f3e71..bc7ba6cf9917 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b6e37e55c250f5233401b2566b1a4b512a98bc7b
+refs/heads/master: 15880352659a363209c5ad9cfc796a9c8a7f5196
diff --git a/trunk/drivers/net/slhc.c b/trunk/drivers/net/slhc.c
index 3a1b7131681c..f0adad520af2 100644
--- a/trunk/drivers/net/slhc.c
+++ b/trunk/drivers/net/slhc.c
@@ -94,27 +94,24 @@ slhc_init(int rslots, int tslots)
 	register struct cstate *ts;
 	struct slcompress *comp;
 
-	comp = (struct slcompress *)kmalloc(sizeof(struct slcompress),
+	comp = (struct slcompress *)kzalloc(sizeof(struct slcompress),
 					    GFP_KERNEL);
 	if (! comp)
 		goto out_fail;
-	memset(comp, 0, sizeof(struct slcompress));
 
 	if ( rslots > 0  &&  rslots < 256 ) {
 		size_t rsize = rslots * sizeof(struct cstate);
-		comp->rstate = (struct cstate *) kmalloc(rsize, GFP_KERNEL);
+		comp->rstate = (struct cstate *) kzalloc(rsize, GFP_KERNEL);
 		if (! comp->rstate)
 			goto out_free;
-		memset(comp->rstate, 0, rsize);
 		comp->rslot_limit = rslots - 1;
 	}
 
 	if ( tslots > 0  &&  tslots < 256 ) {
 		size_t tsize = tslots * sizeof(struct cstate);
-		comp->tstate = (struct cstate *) kmalloc(tsize, GFP_KERNEL);
+		comp->tstate = (struct cstate *) kzalloc(tsize, GFP_KERNEL);
 		if (! comp->tstate)
 			goto out_free2;
-		memset(comp->tstate, 0, tsize);
 		comp->tslot_limit = tslots - 1;
 	}