---

yaml --- r: 136103 b: refs/heads/master c: 5b28bea h: refs/heads/master i: 136101: 94873d2 136099: ea82d5e 136095: dad818d v: v3
git-mirror · Mar 27, 2009 · 5183206 · 5183206
1 parent c3a9356
commit 5183206
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8ebaebca7e9d371d79088190990f95e95e225b6d
+refs/heads/master: 5b28beaf88436fa44fc25ee27a2fadffb75f222e
diff --git a/trunk/drivers/net/gianfar.c b/trunk/drivers/net/gianfar.c
@@ -1310,8 +1310,10 @@ static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
 	base = priv->tx_bd_base;
 
-	/* make space for additional header */
-	if (skb_headroom(skb) < GMAC_FCB_LEN) {
+	/* make space for additional header when fcb is needed */
+	if (((skb->ip_summed == CHECKSUM_PARTIAL) ||
+			(priv->vlgrp && vlan_tx_tag_present(skb))) &&
+			(skb_headroom(skb) < GMAC_FCB_LEN)) {
 		struct sk_buff *skb_new;
 
 		skb_new = skb_realloc_headroom(skb, GMAC_FCB_LEN);