aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/tlan.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/tlan.c')
-rw-r--r--drivers/net/tlan.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/tlan.c b/drivers/net/tlan.c
index 384cb5e28397..70c9ec45d8fb 100644
--- a/drivers/net/tlan.c
+++ b/drivers/net/tlan.c
@@ -1095,11 +1095,11 @@ static int TLan_StartTx( struct sk_buff *skb, struct net_device *dev )
1095 TLAN_DBG( TLAN_DEBUG_TX, "TRANSMIT: %s PHY is not ready\n", 1095 TLAN_DBG( TLAN_DEBUG_TX, "TRANSMIT: %s PHY is not ready\n",
1096 dev->name ); 1096 dev->name );
1097 dev_kfree_skb_any(skb); 1097 dev_kfree_skb_any(skb);
1098 return 0; 1098 return NETDEV_TX_OK;
1099 } 1099 }
1100 1100
1101 if (skb_padto(skb, TLAN_MIN_FRAME_SIZE)) 1101 if (skb_padto(skb, TLAN_MIN_FRAME_SIZE))
1102 return 0; 1102 return NETDEV_TX_OK;
1103 txlen = max(skb->len, (unsigned int)TLAN_MIN_FRAME_SIZE); 1103 txlen = max(skb->len, (unsigned int)TLAN_MIN_FRAME_SIZE);
1104 1104
1105 tail_list = priv->txList + priv->txTail; 1105 tail_list = priv->txList + priv->txTail;
@@ -1150,7 +1150,7 @@ static int TLan_StartTx( struct sk_buff *skb, struct net_device *dev )
1150 CIRC_INC( priv->txTail, TLAN_NUM_TX_LISTS ); 1150 CIRC_INC( priv->txTail, TLAN_NUM_TX_LISTS );
1151 1151
1152 dev->trans_start = jiffies; 1152 dev->trans_start = jiffies;
1153 return 0; 1153 return NETDEV_TX_OK;
1154 1154
1155} /* TLan_StartTx */ 1155} /* TLan_StartTx */
1156 1156