diff options
author | Stephen Hemminger <shemminger@vyatta.com> | 2009-08-31 15:50:58 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-09-01 04:14:07 -0400 |
commit | 61357325f377889a1daffa14962d705dc814dd0e (patch) | |
tree | 7b436f1097abbc5681de6d1e5901f62963b42220 /drivers/net/netxen/netxen_nic_main.c | |
parent | d0cf9c0dadcdc89a755bcb301cfc9c796eb28ccf (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/netxen/netxen_nic_main.c')
-rw-r--r-- | drivers/net/netxen/netxen_nic_main.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c index fab51d16f5fb..f824a392bf56 100644 --- a/drivers/net/netxen/netxen_nic_main.c +++ b/drivers/net/netxen/netxen_nic_main.c | |||
@@ -63,7 +63,8 @@ static int __devinit netxen_nic_probe(struct pci_dev *pdev, | |||
63 | static void __devexit netxen_nic_remove(struct pci_dev *pdev); | 63 | static void __devexit netxen_nic_remove(struct pci_dev *pdev); |
64 | static int netxen_nic_open(struct net_device *netdev); | 64 | static int netxen_nic_open(struct net_device *netdev); |
65 | static int netxen_nic_close(struct net_device *netdev); | 65 | static int netxen_nic_close(struct net_device *netdev); |
66 | static int netxen_nic_xmit_frame(struct sk_buff *, struct net_device *); | 66 | static netdev_tx_t netxen_nic_xmit_frame(struct sk_buff *, |
67 | struct net_device *); | ||
67 | static void netxen_tx_timeout(struct net_device *netdev); | 68 | static void netxen_tx_timeout(struct net_device *netdev); |
68 | static void netxen_reset_task(struct work_struct *work); | 69 | static void netxen_reset_task(struct work_struct *work); |
69 | static void netxen_watchdog(unsigned long); | 70 | static void netxen_watchdog(unsigned long); |
@@ -1599,7 +1600,7 @@ netxen_clear_cmddesc(u64 *desc) | |||
1599 | desc[2] = 0ULL; | 1600 | desc[2] = 0ULL; |
1600 | } | 1601 | } |
1601 | 1602 | ||
1602 | static int | 1603 | static netdev_tx_t |
1603 | netxen_nic_xmit_frame(struct sk_buff *skb, struct net_device *netdev) | 1604 | netxen_nic_xmit_frame(struct sk_buff *skb, struct net_device *netdev) |
1604 | { | 1605 | { |
1605 | struct netxen_adapter *adapter = netdev_priv(netdev); | 1606 | struct netxen_adapter *adapter = netdev_priv(netdev); |