diff options
author | Stephen Hemminger <shemminger@vyatta.com> | 2009-08-31 15:50:53 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-09-01 04:13:46 -0400 |
commit | ad096463f7ff809389454ea4219058a36564d55e (patch) | |
tree | 2155a3dc61332d6fd78958e72411e93454a81287 /drivers/net/tulip/dmfe.c | |
parent | 3a27c149ab0e31a7b86e5ee6a27bb3b8b5687f32 (diff) |
tulip: convert drivers to netdev_tx_t
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/tulip/dmfe.c')
-rw-r--r-- | drivers/net/tulip/dmfe.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/tulip/dmfe.c b/drivers/net/tulip/dmfe.c index 5e15fab58c17..a45ded0538b8 100644 --- a/drivers/net/tulip/dmfe.c +++ b/drivers/net/tulip/dmfe.c | |||
@@ -311,7 +311,7 @@ static u8 SF_mode; /* Special Function: 1:VLAN, 2:RX Flow Control | |||
311 | 311 | ||
312 | /* function declaration ------------------------------------- */ | 312 | /* function declaration ------------------------------------- */ |
313 | static int dmfe_open(struct DEVICE *); | 313 | static int dmfe_open(struct DEVICE *); |
314 | static int dmfe_start_xmit(struct sk_buff *, struct DEVICE *); | 314 | static netdev_tx_t dmfe_start_xmit(struct sk_buff *, struct DEVICE *); |
315 | static int dmfe_stop(struct DEVICE *); | 315 | static int dmfe_stop(struct DEVICE *); |
316 | static void dmfe_set_filter_mode(struct DEVICE *); | 316 | static void dmfe_set_filter_mode(struct DEVICE *); |
317 | static const struct ethtool_ops netdev_ethtool_ops; | 317 | static const struct ethtool_ops netdev_ethtool_ops; |
@@ -661,7 +661,8 @@ static void dmfe_init_dm910x(struct DEVICE *dev) | |||
661 | * Send a packet to media from the upper layer. | 661 | * Send a packet to media from the upper layer. |
662 | */ | 662 | */ |
663 | 663 | ||
664 | static int dmfe_start_xmit(struct sk_buff *skb, struct DEVICE *dev) | 664 | static netdev_tx_t dmfe_start_xmit(struct sk_buff *skb, |
665 | struct DEVICE *dev) | ||
665 | { | 666 | { |
666 | struct dmfe_board_info *db = netdev_priv(dev); | 667 | struct dmfe_board_info *db = netdev_priv(dev); |
667 | struct tx_desc *txptr; | 668 | struct tx_desc *txptr; |