---

yaml --- r: 200147 b: refs/heads/master c: 53ee490 h: refs/heads/master i: 200145: 8131348 200143: 990848f v: v3
git-mirror · Jun 2, 2010 · 5fc3d20 · 5fc3d20
1 parent 4c7937a
commit 5fc3d20
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ceb3d2394532540a52ce34f71e67c8d008913f79
+refs/heads/master: 53ee490ac5836d506ea5830f821045aafa3c196f
diff --git a/trunk/drivers/net/korina.c b/trunk/drivers/net/korina.c
@@ -765,10 +765,9 @@ static int korina_alloc_ring(struct net_device *dev)
 
 	/* Initialize the receive descriptors */
 	for (i = 0; i < KORINA_NUM_RDS; i++) {
-		skb = dev_alloc_skb(KORINA_RBSIZE + 2);
+		skb = netdev_alloc_skb_ip_align(dev, KORINA_RBSIZE);
 		if (!skb)
 			return -ENOMEM;
-		skb_reserve(skb, 2);
 		lp->rx_skb[i] = skb;
 		lp->rd_ring[i].control = DMA_DESC_IOD |
 				DMA_COUNT(KORINA_RBSIZE);