From f12c377aeff4ac717aeaecb529920038dcf74c2f Mon Sep 17 00:00:00 2001
From: Sascha Hauer <s.hauer@pengutronix.de>
Date: Wed, 15 Apr 2009 01:32:21 +0000
Subject: [PATCH] --- yaml --- r: 149773 b: refs/heads/master c:
 8549889c3369f7653bd98861c3d2cf97d810dc37 h: refs/heads/master i:   149771:
 3bf5d4279e797c2866f0333101105d81d3f005f8 v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/net/fec.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 1e26e1034627..e21a4e4892bd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4f1ceb4b46d523382f5a46622af9d3315a9b3e7f
+refs/heads/master: 8549889c3369f7653bd98861c3d2cf97d810dc37
diff --git a/trunk/drivers/net/fec.c b/trunk/drivers/net/fec.c
index 5ca2d6bcc23a..ba3eb54b63f5 100644
--- a/trunk/drivers/net/fec.c
+++ b/trunk/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);