diff options
author | Stephen Hemminger <shemminger@vyatta.com> | 2009-08-31 21:50:55 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-09-01 10:13:52 +0200 |
commit | 3b29a56d31d585d39bf9ffe9ef1f10bd637ee0f1 (patch) | |
tree | 32bef42ee7730a73422195347476d412a5cb8fde /drivers/net/e100.c | |
parent | 3com: convert drivers to netdev_tx_t (diff) | |
download | linux-3b29a56d31d585d39bf9ffe9ef1f10bd637ee0f1.tar.xz linux-3b29a56d31d585d39bf9ffe9ef1f10bd637ee0f1.zip |
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/e100.c')
-rw-r--r-- | drivers/net/e100.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/e100.c b/drivers/net/e100.c index 569df19f0df5..6a3176042c47 100644 --- a/drivers/net/e100.c +++ b/drivers/net/e100.c @@ -1690,7 +1690,8 @@ static void e100_xmit_prepare(struct nic *nic, struct cb *cb, cb->u.tcb.tbd.size = cpu_to_le16(skb->len); } -static int e100_xmit_frame(struct sk_buff *skb, struct net_device *netdev) +static netdev_tx_t e100_xmit_frame(struct sk_buff *skb, + struct net_device *netdev) { struct nic *nic = netdev_priv(netdev); int err; |