---

yaml --- r: 87229 b: refs/heads/master c: 02ff05c h: refs/heads/master i: 87227: fd65835 v: v3
git-mirror · Mar 6, 2008 · 84279e6 · 84279e6
1 parent 30b48fb
commit 84279e6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -900,14 +900,15 @@ 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,
 					"out of memory for Rx'd frame\n");
 			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));