From: Sascha Hauer <s.hauer@pengutronix.de>
Date: Wed, 15 Apr 2009 01:32:21 +0000 (+0000)
Subject: fec: align receive packets
X-Git-Tag: v2.6.31-rc1~14^2~697
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8549889c3369f7653bd98861c3d2cf97d810dc37;p=profile%2Fivi%2Fkernel-x86-ivi.git

fec: align receive packets

Otherwise we get a lot of alignment errors

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/fec.c b/drivers/net/fec.c
index 5ca2d6b..ba3eb54 100644
--- a/drivers/net/fec.c
+++ b/drivers/net/fec.c
@@ -598,13 +598,14 @@ fec_enet_rx(struct net_device *dev)
 		 * include that when passing upstream as it messes up
 		 * bridging applications.
 		 */
-		skb = dev_alloc_skb(pkt_len - 4);
+		skb = dev_alloc_skb(pkt_len - 4 + NET_IP_ALIGN);
 
-		if (skb == NULL) {
+		if (unlikely(!skb)) {
 			printk("%s: Memory squeeze, dropping packet.\n",
 					dev->name);
 			dev->stats.rx_dropped++;
 		} else {
+			skb_reserve(skb, NET_IP_ALIGN);
 			skb_put(skb, pkt_len - 4);	/* Make room */
 			skb_copy_to_linear_data(skb, data, pkt_len - 4);
 			skb->protocol = eth_type_trans(skb, dev);