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);