---

yaml --- r: 167003 b: refs/heads/master c: 050f91d h: refs/heads/master i: 167001: c1d6b2f 166999: fde2f60 v: v3
git-mirror · Oct 7, 2009 · 9eebaf5 · 9eebaf5
1 parent e1bb5ce
commit 9eebaf5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3ee19a85bb428b8363699dff9e1c4041c107d46a
+refs/heads/master: 050f91dcd9a45a14449dded5180f633692b588d2
diff --git a/trunk/drivers/net/ethoc.c b/trunk/drivers/net/ethoc.c
@@ -399,6 +399,10 @@ static int ethoc_rx(struct net_device *dev, int limit)
 		if (ethoc_update_rx_stats(priv, &bd) == 0) {
 			int size = bd.stat >> 16;
 			struct sk_buff *skb = netdev_alloc_skb(dev, size);
+
+			size -= 4; /* strip the CRC */
+			skb_reserve(skb, 2); /* align TCP/IP header */
+
 			if (likely(skb)) {
 				void *src = phys_to_virt(bd.addr);
 				memcpy_fromio(skb_put(skb, size), src, size);