aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/sky2.c
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@vyatta.com>2009-08-31 15:50:58 -0400
committerDavid S. Miller <davem@davemloft.net>2009-09-01 04:14:07 -0400
commit61357325f377889a1daffa14962d705dc814dd0e (patch)
tree7b436f1097abbc5681de6d1e5901f62963b42220 /drivers/net/sky2.c
parentd0cf9c0dadcdc89a755bcb301cfc9c796eb28ccf (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/sky2.c')
-rw-r--r--drivers/net/sky2.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index dd630cf18b4d..c7c0a5b7b53a 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -1574,7 +1574,8 @@ static void sky2_tx_unmap(struct pci_dev *pdev,
1574 * the number of ring elements will probably be less than the number 1574 * the number of ring elements will probably be less than the number
1575 * of list elements used. 1575 * of list elements used.
1576 */ 1576 */
1577static int sky2_xmit_frame(struct sk_buff *skb, struct net_device *dev) 1577static netdev_tx_t sky2_xmit_frame(struct sk_buff *skb,
1578 struct net_device *dev)
1578{ 1579{
1579 struct sky2_port *sky2 = netdev_priv(dev); 1580 struct sky2_port *sky2 = netdev_priv(dev);
1580 struct sky2_hw *hw = sky2->hw; 1581 struct sky2_hw *hw = sky2->hw;