From: Li Yang <leoli@freescale.com>
Date: Fri, 27 Mar 2009 22:54:30 +0000 (-0700)
Subject: gianfar: only check headroom when FCB is needed
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=5b28beaf88436fa44fc25ee27a2fadffb75f222e;p=linux-2.6-omap-h63xx.git

gianfar: only check headroom when FCB is needed

Signed-off-by: Li Yang <leoli@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index 44cbf2622b4..6a38800be3f 100644
--- a/drivers/net/gianfar.c
+++ b/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);