]> err.no Git - linux-2.6/commitdiff
[PATCH] AT91RM9200 Ethernet: Use dev_alloc_skb()
authorAndrew Victor <andrew@sanpeople.com>
Tue, 5 Dec 2006 13:37:02 +0000 (15:37 +0200)
committerJeff Garzik <jeff@garzik.org>
Thu, 7 Dec 2006 09:58:32 +0000 (04:58 -0500)
Use dev_alloc_skb() instead of alloc_skb().

It is also not necessary to adjust skb->len manually since that's
already done by skb_put().

Signed-off-by: Andrew Victor <andrew@sanpeople.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
drivers/net/arm/at91_ether.c

index f33d957adc7a10c13e6c063b2a23a66d37d132b1..fada15d959dec6fd6a7e8f72c8c32ed50afdb3df 100644 (file)
@@ -853,14 +853,13 @@ static void at91ether_rx(struct net_device *dev)
        while (dlist->descriptors[lp->rxBuffIndex].addr & EMAC_DESC_DONE) {
                p_recv = dlist->recv_buf[lp->rxBuffIndex];
                pktlen = dlist->descriptors[lp->rxBuffIndex].size & 0x7ff;      /* Length of frame including FCS */
-               skb = alloc_skb(pktlen + 2, GFP_ATOMIC);
+               skb = dev_alloc_skb(pktlen + 2);
                if (skb != NULL) {
                        skb_reserve(skb, 2);
                        memcpy(skb_put(skb, pktlen), p_recv, pktlen);
 
                        skb->dev = dev;
                        skb->protocol = eth_type_trans(skb, dev);
-                       skb->len = pktlen;
                        dev->last_rx = jiffies;
                        lp->stats.rx_bytes += pktlen;
                        netif_rx(skb);