git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
sysctl: remove "struct file *" argument of ->proc_handler
[safe/jmp/linux-2.6]
/
drivers
/
net
/
acenic.c
diff --git
a/drivers/net/acenic.c
b/drivers/net/acenic.c
index
08419ee
..
5f0b05c
100644
(file)
--- a/
drivers/net/acenic.c
+++ b/
drivers/net/acenic.c
@@
-2464,7
+2464,8
@@
ace_load_tx_bd(struct ace_private *ap, struct tx_desc *desc, u64 addr,
}
-static int ace_start_xmit(struct sk_buff *skb, struct net_device *dev)
+static netdev_tx_t ace_start_xmit(struct sk_buff *skb,
+ struct net_device *dev)
{
struct ace_private *ap = netdev_priv(dev);
struct ace_regs __iomem *regs = ap->regs;