aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/defxx.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/defxx.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/defxx.c')
-rw-r--r--drivers/net/defxx.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/net/defxx.c b/drivers/net/defxx.c
index b2e0a8fc21d7..6a6ea038d7a3 100644
--- a/drivers/net/defxx.c
+++ b/drivers/net/defxx.c
@@ -300,7 +300,8 @@ static int dfx_rcv_init(DFX_board_t *bp, int get_buffers);
300static void dfx_rcv_queue_process(DFX_board_t *bp); 300static void dfx_rcv_queue_process(DFX_board_t *bp);
301static void dfx_rcv_flush(DFX_board_t *bp); 301static void dfx_rcv_flush(DFX_board_t *bp);
302 302
303static int dfx_xmt_queue_pkt(struct sk_buff *skb, struct net_device *dev); 303static netdev_tx_t dfx_xmt_queue_pkt(struct sk_buff *skb,
304 struct net_device *dev);
304static int dfx_xmt_done(DFX_board_t *bp); 305static int dfx_xmt_done(DFX_board_t *bp);
305static void dfx_xmt_flush(DFX_board_t *bp); 306static void dfx_xmt_flush(DFX_board_t *bp);
306 307
@@ -3188,11 +3189,8 @@ static void dfx_rcv_queue_process(
3188 * None 3189 * None
3189 */ 3190 */
3190 3191
3191static int dfx_xmt_queue_pkt( 3192static netdev_tx_t dfx_xmt_queue_pkt(struct sk_buff *skb,
3192 struct sk_buff *skb, 3193 struct net_device *dev)
3193 struct net_device *dev
3194 )
3195
3196 { 3194 {
3197 DFX_board_t *bp = netdev_priv(dev); 3195 DFX_board_t *bp = netdev_priv(dev);
3198 u8 prod; /* local transmit producer index */ 3196 u8 prod; /* local transmit producer index */