From 0801a81b9dc0de1036c8bf59fffa9a2493213ccd Mon Sep 17 00:00:00 2001 From: Andrew Victor Date: Tue, 5 Dec 2006 15:37:02 +0200 Subject: [PATCH] --- yaml --- r: 43216 b: refs/heads/master c: a3f63e4f4be0da938771d754e846ff0019f9d42e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/arm/at91_ether.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 08035cbc8f43..7f9d1afb86f4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 51cc21045714cc9f48eb6901d95eb4e552ef2ca4 +refs/heads/master: a3f63e4f4be0da938771d754e846ff0019f9d42e diff --git a/trunk/drivers/net/arm/at91_ether.c b/trunk/drivers/net/arm/at91_ether.c index f33d957adc7a..fada15d959de 100644 --- a/trunk/drivers/net/arm/at91_ether.c +++ b/trunk/drivers/net/arm/at91_ether.c @@ -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);