---

yaml --- r: 266683 b: refs/heads/master c: 96cd895 h: refs/heads/master i: 266681: 6e04985 266679: 8128149 v: v3
git-mirror · Oct 14, 2011 · 0005aa2 · 0005aa2
1 parent d8e7e89
commit 0005aa2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e7e5a4033f765e2a37095cd0a73261c99840f77e
+refs/heads/master: 96cd8951684adaa5fd72952adef532d0b42f70e1
diff --git a/trunk/drivers/net/ethernet/faraday/ftmac100.c b/trunk/drivers/net/ethernet/faraday/ftmac100.c
@@ -439,7 +439,10 @@ static bool ftmac100_rx_packet(struct ftmac100 *priv, int *processed)
 	skb_fill_page_desc(skb, 0, page, 0, length);
 	skb->len += length;
 	skb->data_len += length;
-	skb->truesize += length;
+
+	/* page might be freed in __pskb_pull_tail() */
+	if (length > 64)
+		skb->truesize += PAGE_SIZE;
 	__pskb_pull_tail(skb, min(length, 64));
 
 	ftmac100_alloc_rx_page(priv, rxdes, GFP_ATOMIC);