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
Spelling fix in IPW2100 and IPW2200 Kconfig entries
[safe/jmp/linux-2.6]
/
drivers
/
net
/
pppox.c
diff --git
a/drivers/net/pppox.c
b/drivers/net/pppox.c
index
0c1e114
..
9315046
100644
(file)
--- a/
drivers/net/pppox.c
+++ b/
drivers/net/pppox.c
@@
-68,8
+68,7
@@
EXPORT_SYMBOL(register_pppox_proto);
EXPORT_SYMBOL(unregister_pppox_proto);
EXPORT_SYMBOL(pppox_unbind_sock);
EXPORT_SYMBOL(unregister_pppox_proto);
EXPORT_SYMBOL(pppox_unbind_sock);
-static int pppox_ioctl(struct socket* sock, unsigned int cmd,
- unsigned long arg)
+int pppox_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
{
struct sock *sk = sock->sk;
struct pppox_sock *po = pppox_sk(sk);
{
struct sock *sk = sock->sk;
struct pppox_sock *po = pppox_sk(sk);
@@
-105,6
+104,7
@@
static int pppox_ioctl(struct socket* sock, unsigned int cmd,
return rc;
}
return rc;
}
+EXPORT_SYMBOL(pppox_ioctl);
static int pppox_create(struct socket *sock, int protocol)
{
static int pppox_create(struct socket *sock, int protocol)
{
@@
-119,11
+119,7
@@
static int pppox_create(struct socket *sock, int protocol)
goto out;
rc = pppox_protos[protocol]->create(sock);
goto out;
rc = pppox_protos[protocol]->create(sock);
- if (!rc) {
- /* We get to set the ioctl handler. */
- /* For everything else, pppox is just a shell. */
- sock->ops->ioctl = pppox_ioctl;
- }
+
module_put(pppox_protos[protocol]->owner);
out:
return rc;
module_put(pppox_protos[protocol]->owner);
out:
return rc;