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/e1000e | |
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/e1000e')
-rw-r--r-- | drivers/net/e1000e/netdev.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c index 63415bb6f48f..428bf6d72f37 100644 --- a/drivers/net/e1000e/netdev.c +++ b/drivers/net/e1000e/netdev.c | |||
@@ -4097,7 +4097,8 @@ static int e1000_maybe_stop_tx(struct net_device *netdev, int size) | |||
4097 | } | 4097 | } |
4098 | 4098 | ||
4099 | #define TXD_USE_COUNT(S, X) (((S) >> (X)) + 1 ) | 4099 | #define TXD_USE_COUNT(S, X) (((S) >> (X)) + 1 ) |
4100 | static int e1000_xmit_frame(struct sk_buff *skb, struct net_device *netdev) | 4100 | static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb, |
4101 | struct net_device *netdev) | ||
4101 | { | 4102 | { |
4102 | struct e1000_adapter *adapter = netdev_priv(netdev); | 4103 | struct e1000_adapter *adapter = netdev_priv(netdev); |
4103 | struct e1000_ring *tx_ring = adapter->tx_ring; | 4104 | struct e1000_ring *tx_ring = adapter->tx_ring; |