summaryrefslogtreecommitdiff
path: root/drivers/net/e100.c
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@vyatta.com>2009-08-31 23:50:55 +0400
committerDavid S. Miller <davem@davemloft.net>2009-09-01 12:13:52 +0400
commit3b29a56d31d585d39bf9ffe9ef1f10bd637ee0f1 (patch)
tree32bef42ee7730a73422195347476d412a5cb8fde /drivers/net/e100.c
parent27a1de95a1461ec0589005c293d6ac23a46cb72d (diff)
downloadlinux-3b29a56d31d585d39bf9ffe9ef1f10bd637ee0f1.tar.xz
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.c3
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;