aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/gianfar.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/gianfar.c')
-rw-r--r--drivers/net/gianfar.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index 6180089bf67a..4c4cc80ec0a1 100644
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@ -2075,7 +2075,7 @@ static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev)
2075 2075
2076 /* make space for additional header when fcb is needed */ 2076 /* make space for additional header when fcb is needed */
2077 if (((skb->ip_summed == CHECKSUM_PARTIAL) || 2077 if (((skb->ip_summed == CHECKSUM_PARTIAL) ||
2078 (priv->vlgrp && vlan_tx_tag_present(skb)) || 2078 vlan_tx_tag_present(skb) ||
2079 unlikely(do_tstamp)) && 2079 unlikely(do_tstamp)) &&
2080 (skb_headroom(skb) < GMAC_FCB_LEN)) { 2080 (skb_headroom(skb) < GMAC_FCB_LEN)) {
2081 struct sk_buff *skb_new; 2081 struct sk_buff *skb_new;
@@ -2161,7 +2161,7 @@ static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev)
2161 gfar_tx_checksum(skb, fcb); 2161 gfar_tx_checksum(skb, fcb);
2162 } 2162 }
2163 2163
2164 if (priv->vlgrp && vlan_tx_tag_present(skb)) { 2164 if (vlan_tx_tag_present(skb)) {
2165 if (unlikely(NULL == fcb)) { 2165 if (unlikely(NULL == fcb)) {
2166 fcb = gfar_add_fcb(skb); 2166 fcb = gfar_add_fcb(skb);
2167 lstatus |= BD_LFLAG(TXBD_TOE); 2167 lstatus |= BD_LFLAG(TXBD_TOE);