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/uli526x.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/uli526x.c')
-rw-r--r-- | drivers/net/tulip/uli526x.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/tulip/uli526x.c b/drivers/net/tulip/uli526x.c index 9074a34eb814..c457a0ca55ad 100644 --- a/drivers/net/tulip/uli526x.c +++ b/drivers/net/tulip/uli526x.c | |||
@@ -215,7 +215,8 @@ static int mode = 8; | |||
215 | 215 | ||
216 | /* function declaration ------------------------------------- */ | 216 | /* function declaration ------------------------------------- */ |
217 | static int uli526x_open(struct net_device *); | 217 | static int uli526x_open(struct net_device *); |
218 | static int uli526x_start_xmit(struct sk_buff *, struct net_device *); | 218 | static netdev_tx_t uli526x_start_xmit(struct sk_buff *, |
219 | struct net_device *); | ||
219 | static int uli526x_stop(struct net_device *); | 220 | static int uli526x_stop(struct net_device *); |
220 | static void uli526x_set_filter_mode(struct net_device *); | 221 | static void uli526x_set_filter_mode(struct net_device *); |
221 | static const struct ethtool_ops netdev_ethtool_ops; | 222 | static const struct ethtool_ops netdev_ethtool_ops; |
@@ -567,7 +568,8 @@ static void uli526x_init(struct net_device *dev) | |||
567 | * Send a packet to media from the upper layer. | 568 | * Send a packet to media from the upper layer. |
568 | */ | 569 | */ |
569 | 570 | ||
570 | static int uli526x_start_xmit(struct sk_buff *skb, struct net_device *dev) | 571 | static netdev_tx_t uli526x_start_xmit(struct sk_buff *skb, |
572 | struct net_device *dev) | ||
571 | { | 573 | { |
572 | struct uli526x_board_info *db = netdev_priv(dev); | 574 | struct uli526x_board_info *db = netdev_priv(dev); |
573 | struct tx_desc *txptr; | 575 | struct tx_desc *txptr; |