From 5fc3d20a4922e2caff3fc4f9f6fcd751ddb6c392 Mon Sep 17 00:00:00 2001
From: Phil Sutter <phil@nwl.cc>
Date: Sat, 29 May 2010 13:23:35 +0000
Subject: [PATCH] --- yaml --- r: 200147 b: refs/heads/master c:
 53ee490ac5836d506ea5830f821045aafa3c196f h: refs/heads/master i:   200145:
 8131348f257c8a11e5fc9da4e95d8dd935fbf9ee   200143:
 990848f2c34528afdfc2ac4840c0c00b46013bec v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/net/korina.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 8b22a7b3dbd2..2ce86579cc9d 100644
--- 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
index 13533f937e05..3e9b6b7be42e 100644
--- 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);