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
tokenring: convert to use netdev_for_each_mc_addr
[safe/jmp/linux-2.6]
/
drivers
/
net
/
pppox.c
diff --git
a/drivers/net/pppox.c
b/drivers/net/pppox.c
index
c14ee24
..
ac806b2
100644
(file)
--- a/
drivers/net/pppox.c
+++ b/
drivers/net/pppox.c
@@
-104,7
+104,8
@@
int pppox_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
EXPORT_SYMBOL(pppox_ioctl);
-static int pppox_create(struct net *net, struct socket *sock, int protocol)
+static int pppox_create(struct net *net, struct socket *sock, int protocol,
+ int kern)
{
int rc = -EPROTOTYPE;