diff options
author | Stephen Hemminger <shemminger@vyatta.com> | 2009-08-31 15:50:55 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-09-01 04:13:52 -0400 |
commit | 3b29a56d31d585d39bf9ffe9ef1f10bd637ee0f1 (patch) | |
tree | 32bef42ee7730a73422195347476d412a5cb8fde /drivers/net/ixgbe/ixgbe_main.c | |
parent | 27a1de95a1461ec0589005c293d6ac23a46cb72d (diff) |
intel: convert drivers to netdev_tx_t
Get rid of some bogus return wrapping as well.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ixgbe/ixgbe_main.c')
-rw-r--r-- | drivers/net/ixgbe/ixgbe_main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c index 0bea096e964b..7e964a689883 100644 --- a/drivers/net/ixgbe/ixgbe_main.c +++ b/drivers/net/ixgbe/ixgbe_main.c | |||
@@ -5107,7 +5107,8 @@ static u16 ixgbe_select_queue(struct net_device *dev, struct sk_buff *skb) | |||
5107 | return skb_tx_hash(dev, skb); | 5107 | return skb_tx_hash(dev, skb); |
5108 | } | 5108 | } |
5109 | 5109 | ||
5110 | static int ixgbe_xmit_frame(struct sk_buff *skb, struct net_device *netdev) | 5110 | static netdev_tx_t ixgbe_xmit_frame(struct sk_buff *skb, |
5111 | struct net_device *netdev) | ||
5111 | { | 5112 | { |
5112 | struct ixgbe_adapter *adapter = netdev_priv(netdev); | 5113 | struct ixgbe_adapter *adapter = netdev_priv(netdev); |
5113 | struct ixgbe_ring *tx_ring; | 5114 | struct ixgbe_ring *tx_ring; |