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);