diff options
author | Stephen Hemminger <shemminger@vyatta.com> | 2009-08-31 15:50:47 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-09-01 04:13:28 -0400 |
commit | d71a674922e7519edb477ecb585e7d29d69c7aa7 (patch) | |
tree | 816f6936957d5dbe2670079f64bdbd1f52cec00d /drivers/net/wan/lmc | |
parent | 61a84108547c1c017683f15311ccbede249fc6fa (diff) |
wan: 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/wan/lmc')
-rw-r--r-- | drivers/net/wan/lmc/lmc_main.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/wan/lmc/lmc_main.c b/drivers/net/wan/lmc/lmc_main.c index 4b83d8872857..7ea71b33d2e9 100644 --- a/drivers/net/wan/lmc/lmc_main.c +++ b/drivers/net/wan/lmc/lmc_main.c | |||
@@ -89,7 +89,8 @@ MODULE_DEVICE_TABLE(pci, lmc_pci_tbl); | |||
89 | MODULE_LICENSE("GPL v2"); | 89 | MODULE_LICENSE("GPL v2"); |
90 | 90 | ||
91 | 91 | ||
92 | static int lmc_start_xmit(struct sk_buff *skb, struct net_device *dev); | 92 | static netdev_tx_t lmc_start_xmit(struct sk_buff *skb, |
93 | struct net_device *dev); | ||
93 | static int lmc_rx (struct net_device *dev); | 94 | static int lmc_rx (struct net_device *dev); |
94 | static int lmc_open(struct net_device *dev); | 95 | static int lmc_open(struct net_device *dev); |
95 | static int lmc_close(struct net_device *dev); | 96 | static int lmc_close(struct net_device *dev); |
@@ -1423,12 +1424,12 @@ lmc_int_fail_out: | |||
1423 | return IRQ_RETVAL(handled); | 1424 | return IRQ_RETVAL(handled); |
1424 | } | 1425 | } |
1425 | 1426 | ||
1426 | static int lmc_start_xmit(struct sk_buff *skb, struct net_device *dev) | 1427 | static netdev_tx_t lmc_start_xmit(struct sk_buff *skb, |
1428 | struct net_device *dev) | ||
1427 | { | 1429 | { |
1428 | lmc_softc_t *sc = dev_to_sc(dev); | 1430 | lmc_softc_t *sc = dev_to_sc(dev); |
1429 | u32 flag; | 1431 | u32 flag; |
1430 | int entry; | 1432 | int entry; |
1431 | int ret = NETDEV_TX_OK; | ||
1432 | unsigned long flags; | 1433 | unsigned long flags; |
1433 | 1434 | ||
1434 | lmc_trace(dev, "lmc_start_xmit in"); | 1435 | lmc_trace(dev, "lmc_start_xmit in"); |
@@ -1510,7 +1511,7 @@ static int lmc_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
1510 | spin_unlock_irqrestore(&sc->lmc_lock, flags); | 1511 | spin_unlock_irqrestore(&sc->lmc_lock, flags); |
1511 | 1512 | ||
1512 | lmc_trace(dev, "lmc_start_xmit_out"); | 1513 | lmc_trace(dev, "lmc_start_xmit_out"); |
1513 | return ret; | 1514 | return NETDEV_TX_OK; |
1514 | } | 1515 | } |
1515 | 1516 | ||
1516 | 1517 | ||