diff options
Diffstat (limited to 'drivers/net/tulip/de4x5.c')
-rw-r--r-- | drivers/net/tulip/de4x5.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/net/tulip/de4x5.c b/drivers/net/tulip/de4x5.c index acfdccd44567..a8349b7200b5 100644 --- a/drivers/net/tulip/de4x5.c +++ b/drivers/net/tulip/de4x5.c | |||
@@ -895,7 +895,8 @@ static struct { | |||
895 | ** Public Functions | 895 | ** Public Functions |
896 | */ | 896 | */ |
897 | static int de4x5_open(struct net_device *dev); | 897 | static int de4x5_open(struct net_device *dev); |
898 | static int de4x5_queue_pkt(struct sk_buff *skb, struct net_device *dev); | 898 | static netdev_tx_t de4x5_queue_pkt(struct sk_buff *skb, |
899 | struct net_device *dev); | ||
899 | static irqreturn_t de4x5_interrupt(int irq, void *dev_id); | 900 | static irqreturn_t de4x5_interrupt(int irq, void *dev_id); |
900 | static int de4x5_close(struct net_device *dev); | 901 | static int de4x5_close(struct net_device *dev); |
901 | static struct net_device_stats *de4x5_get_stats(struct net_device *dev); | 902 | static struct net_device_stats *de4x5_get_stats(struct net_device *dev); |
@@ -1456,18 +1457,16 @@ de4x5_sw_reset(struct net_device *dev) | |||
1456 | /* | 1457 | /* |
1457 | ** Writes a socket buffer address to the next available transmit descriptor. | 1458 | ** Writes a socket buffer address to the next available transmit descriptor. |
1458 | */ | 1459 | */ |
1459 | static int | 1460 | static netdev_tx_t |
1460 | de4x5_queue_pkt(struct sk_buff *skb, struct net_device *dev) | 1461 | de4x5_queue_pkt(struct sk_buff *skb, struct net_device *dev) |
1461 | { | 1462 | { |
1462 | struct de4x5_private *lp = netdev_priv(dev); | 1463 | struct de4x5_private *lp = netdev_priv(dev); |
1463 | u_long iobase = dev->base_addr; | 1464 | u_long iobase = dev->base_addr; |
1464 | int status = NETDEV_TX_OK; | ||
1465 | u_long flags = 0; | 1465 | u_long flags = 0; |
1466 | 1466 | ||
1467 | netif_stop_queue(dev); | 1467 | netif_stop_queue(dev); |
1468 | if (!lp->tx_enable) { /* Cannot send for now */ | 1468 | if (!lp->tx_enable) /* Cannot send for now */ |
1469 | return NETDEV_TX_LOCKED; | 1469 | return NETDEV_TX_LOCKED; |
1470 | } | ||
1471 | 1470 | ||
1472 | /* | 1471 | /* |
1473 | ** Clean out the TX ring asynchronously to interrupts - sometimes the | 1472 | ** Clean out the TX ring asynchronously to interrupts - sometimes the |
@@ -1521,7 +1520,7 @@ de4x5_queue_pkt(struct sk_buff *skb, struct net_device *dev) | |||
1521 | 1520 | ||
1522 | lp->cache.lock = 0; | 1521 | lp->cache.lock = 0; |
1523 | 1522 | ||
1524 | return status; | 1523 | return NETDEV_TX_OK; |
1525 | } | 1524 | } |
1526 | 1525 | ||
1527 | /* | 1526 | /* |