aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/tg3.c
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@vyatta.com>2009-08-31 15:50:58 -0400
committerDavid S. Miller <davem@davemloft.net>2009-09-01 04:14:07 -0400
commit61357325f377889a1daffa14962d705dc814dd0e (patch)
tree7b436f1097abbc5681de6d1e5901f62963b42220 /drivers/net/tg3.c
parentd0cf9c0dadcdc89a755bcb301cfc9c796eb28ccf (diff)
netdev: convert bulk of drivers to netdev_tx_t
In a couple of cases collapse some extra code like: int retval = NETDEV_TX_OK; ... return retval; into return NETDEV_TX_OK; Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/tg3.c')
-rw-r--r--drivers/net/tg3.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index a7d14aae258a..9d5c1786c664 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -5135,7 +5135,8 @@ static void tg3_set_txd(struct tg3_napi *tnapi, int entry,
5135/* hard_start_xmit for devices that don't have any bugs and 5135/* hard_start_xmit for devices that don't have any bugs and
5136 * support TG3_FLG2_HW_TSO_2 only. 5136 * support TG3_FLG2_HW_TSO_2 only.
5137 */ 5137 */
5138static int tg3_start_xmit(struct sk_buff *skb, struct net_device *dev) 5138static netdev_tx_t tg3_start_xmit(struct sk_buff *skb,
5139 struct net_device *dev)
5139{ 5140{
5140 struct tg3 *tp = netdev_priv(dev); 5141 struct tg3 *tp = netdev_priv(dev);
5141 u32 len, entry, base_flags, mss; 5142 u32 len, entry, base_flags, mss;
@@ -5251,7 +5252,8 @@ out_unlock:
5251 return NETDEV_TX_OK; 5252 return NETDEV_TX_OK;
5252} 5253}
5253 5254
5254static int tg3_start_xmit_dma_bug(struct sk_buff *, struct net_device *); 5255static netdev_tx_t tg3_start_xmit_dma_bug(struct sk_buff *,
5256 struct net_device *);
5255 5257
5256/* Use GSO to workaround a rare TSO bug that may be triggered when the 5258/* Use GSO to workaround a rare TSO bug that may be triggered when the
5257 * TSO header is greater than 80 bytes. 5259 * TSO header is greater than 80 bytes.
@@ -5290,7 +5292,8 @@ tg3_tso_bug_end:
5290/* hard_start_xmit for devices that have the 4G bug and/or 40-bit bug and 5292/* hard_start_xmit for devices that have the 4G bug and/or 40-bit bug and
5291 * support TG3_FLG2_HW_TSO_1 or firmware TSO only. 5293 * support TG3_FLG2_HW_TSO_1 or firmware TSO only.
5292 */ 5294 */
5293static int tg3_start_xmit_dma_bug(struct sk_buff *skb, struct net_device *dev) 5295static netdev_tx_t tg3_start_xmit_dma_bug(struct sk_buff *skb,
5296 struct net_device *dev)
5294{ 5297{
5295 struct tg3 *tp = netdev_priv(dev); 5298 struct tg3 *tp = netdev_priv(dev);
5296 u32 len, entry, base_flags, mss; 5299 u32 len, entry, base_flags, mss;