aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/forcedeth.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/forcedeth.c')
-rw-r--r--drivers/net/forcedeth.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index 3b4e0766c7b2..0a1c2bb27d4d 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -2137,7 +2137,7 @@ static void nv_gear_backoff_reseed(struct net_device *dev)
2137 * nv_start_xmit: dev->hard_start_xmit function 2137 * nv_start_xmit: dev->hard_start_xmit function
2138 * Called with netif_tx_lock held. 2138 * Called with netif_tx_lock held.
2139 */ 2139 */
2140static int nv_start_xmit(struct sk_buff *skb, struct net_device *dev) 2140static netdev_tx_t nv_start_xmit(struct sk_buff *skb, struct net_device *dev)
2141{ 2141{
2142 struct fe_priv *np = netdev_priv(dev); 2142 struct fe_priv *np = netdev_priv(dev);
2143 u32 tx_flags = 0; 2143 u32 tx_flags = 0;
@@ -2257,7 +2257,8 @@ static int nv_start_xmit(struct sk_buff *skb, struct net_device *dev)
2257 return NETDEV_TX_OK; 2257 return NETDEV_TX_OK;
2258} 2258}
2259 2259
2260static int nv_start_xmit_optimized(struct sk_buff *skb, struct net_device *dev) 2260static netdev_tx_t nv_start_xmit_optimized(struct sk_buff *skb,
2261 struct net_device *dev)
2261{ 2262{
2262 struct fe_priv *np = netdev_priv(dev); 2263 struct fe_priv *np = netdev_priv(dev);
2263 u32 tx_flags = 0; 2264 u32 tx_flags = 0;