]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
8139too: use netdev_alloc_skb
authorKevin Lo <kevlo@kevlo.org>
Wed, 27 Aug 2008 03:35:13 +0000 (11:35 +0800)
committerJeff Garzik <jgarzik@redhat.com>
Wed, 3 Sep 2008 14:24:14 +0000 (10:24 -0400)
This patch uses netdev_alloc_skb. This sets skb->dev and allows
arch specific allocation. Also cleanup the alignment code.

Signed-off-by: Kevin Lo <kevlo@kevlo.org>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
drivers/net/8139too.c

index 8a5b0d293f7548dbcfaa0e6b9267c21a1d0cf4dc..f6ca99774cc21405f88c5ce72659f3c0af1d9429 100644 (file)
@@ -2009,9 +2009,9 @@ no_early_rx:
                /* Malloc up new buffer, compatible with net-2e. */
                /* Omit the four octet CRC from the length. */
 
-               skb = dev_alloc_skb (pkt_size + 2);
+               skb = netdev_alloc_skb(dev, pkt_size + NET_IP_ALIGN);
                if (likely(skb)) {
-                       skb_reserve (skb, 2);   /* 16 byte align the IP fields. */
+                       skb_reserve (skb, NET_IP_ALIGN);        /* 16 byte align the IP fields. */
 #if RX_BUF_IDX == 3
                        wrap_copy(skb, rx_ring, ring_offset+4, pkt_size);
 #else