From 84279e60b791a9ad6e8531e2112629d57aee71d1 Mon Sep 17 00:00:00 2001
From: David Brownell <dbrownell@users.sourceforge.net>
Date: Wed, 5 Mar 2008 18:51:19 -0800
Subject: [PATCH] --- yaml --- r: 87229 b: refs/heads/master c:
 02ff05c49d7804f2574f358a937b43a41d15e36e h: refs/heads/master i:   87227:
 fd65835ccd5b98cc80b46e1e507257854420ad2c v: v3

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

diff --git a/[refs] b/[refs]
index 350c76c69047..eb260de4bcd6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e8a1d919d16abaccc4564bd913cac9a0c1aaf078
+refs/heads/master: 02ff05c49d7804f2574f358a937b43a41d15e36e
diff --git a/trunk/drivers/net/enc28j60.c b/trunk/drivers/net/enc28j60.c
index 0809a6a5a286..46a90e9ec563 100644
--- a/trunk/drivers/net/enc28j60.c
+++ b/trunk/drivers/net/enc28j60.c
@@ -900,7 +900,7 @@ static void enc28j60_hw_rx(struct net_device *ndev)
 		if (RSV_GETBIT(rxstat, RSV_LENCHECKERR))
 			ndev->stats.rx_frame_errors++;
 	} else {
-		skb = dev_alloc_skb(len);
+		skb = dev_alloc_skb(len + NET_IP_ALIGN);
 		if (!skb) {
 			if (netif_msg_rx_err(priv))
 				dev_err(&ndev->dev,
@@ -908,6 +908,7 @@ static void enc28j60_hw_rx(struct net_device *ndev)
 			ndev->stats.rx_dropped++;
 		} else {
 			skb->dev = ndev;
+			skb_reserve(skb, NET_IP_ALIGN);
 			/* copy the packet from the receive buffer */
 			enc28j60_mem_read(priv, priv->next_pk_ptr + sizeof(rsv),
 					len, skb_put(skb, len));