diff options
author | Li Yang <leoli@freescale.com> | 2009-03-27 18:54:30 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-03-27 18:54:30 -0400 |
commit | 5b28beaf88436fa44fc25ee27a2fadffb75f222e (patch) | |
tree | f8e6b7da27f9a90ac22e0359696572cdb6020ebc /drivers | |
parent | 8ebaebca7e9d371d79088190990f95e95e225b6d (diff) |
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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/gianfar.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c index 44cbf2622b46..6a38800be3f1 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) | |||
1310 | 1310 | ||
1311 | base = priv->tx_bd_base; | 1311 | base = priv->tx_bd_base; |
1312 | 1312 | ||
1313 | /* make space for additional header */ | 1313 | /* make space for additional header when fcb is needed */ |
1314 | if (skb_headroom(skb) < GMAC_FCB_LEN) { | 1314 | if (((skb->ip_summed == CHECKSUM_PARTIAL) || |
1315 | (priv->vlgrp && vlan_tx_tag_present(skb))) && | ||
1316 | (skb_headroom(skb) < GMAC_FCB_LEN)) { | ||
1315 | struct sk_buff *skb_new; | 1317 | struct sk_buff *skb_new; |
1316 | 1318 | ||
1317 | skb_new = skb_realloc_headroom(skb, GMAC_FCB_LEN); | 1319 | skb_new = skb_realloc_headroom(skb, GMAC_FCB_LEN); |