From 518320618aadb9cad594a4ae4892a30869261a57 Mon Sep 17 00:00:00 2001
From: Li Yang <leoli@freescale.com>
Date: Fri, 27 Mar 2009 15:54:30 -0700
Subject: [PATCH] --- yaml --- r: 136103 b: refs/heads/master c:
 5b28beaf88436fa44fc25ee27a2fadffb75f222e h: refs/heads/master i:   136101:
 94873d2e54a271774e09315234f11c0ab84ac3fa   136099:
 ea82d5e91afadd87e7469f42dec244e5406ca6e4   136095:
 dad818d595b2bedfa00e4823a871f316c3e447c9 v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/net/gianfar.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index e9f5bd075ccf..1dbc8cf31b6c 100644
--- 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
index 44cbf2622b46..6a38800be3f1 100644
--- 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);