diff options
Diffstat (limited to 'drivers/net/ixp2000/ixpdev.c')
-rw-r--r-- | drivers/net/ixp2000/ixpdev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ixp2000/ixpdev.c b/drivers/net/ixp2000/ixpdev.c index 9aee0cc922c9..d5932ca3e27d 100644 --- a/drivers/net/ixp2000/ixpdev.c +++ b/drivers/net/ixp2000/ixpdev.c | |||
@@ -15,6 +15,7 @@ | |||
15 | #include <linux/etherdevice.h> | 15 | #include <linux/etherdevice.h> |
16 | #include <linux/init.h> | 16 | #include <linux/init.h> |
17 | #include <linux/moduleparam.h> | 17 | #include <linux/moduleparam.h> |
18 | #include <linux/gfp.h> | ||
18 | #include <asm/hardware/uengine.h> | 19 | #include <asm/hardware/uengine.h> |
19 | #include <asm/io.h> | 20 | #include <asm/io.h> |
20 | #include "ixp2400_rx.ucode" | 21 | #include "ixp2400_rx.ucode" |
@@ -109,9 +110,8 @@ static int ixpdev_rx(struct net_device *dev, int processed, int budget) | |||
109 | if (unlikely(!netif_running(nds[desc->channel]))) | 110 | if (unlikely(!netif_running(nds[desc->channel]))) |
110 | goto err; | 111 | goto err; |
111 | 112 | ||
112 | skb = netdev_alloc_skb(dev, desc->pkt_length + 2); | 113 | skb = netdev_alloc_skb_ip_align(dev, desc->pkt_length); |
113 | if (likely(skb != NULL)) { | 114 | if (likely(skb != NULL)) { |
114 | skb_reserve(skb, 2); | ||
115 | skb_copy_to_linear_data(skb, buf, desc->pkt_length); | 115 | skb_copy_to_linear_data(skb, buf, desc->pkt_length); |
116 | skb_put(skb, desc->pkt_length); | 116 | skb_put(skb, desc->pkt_length); |
117 | skb->protocol = eth_type_trans(skb, nds[desc->channel]); | 117 | skb->protocol = eth_type_trans(skb, nds[desc->channel]); |