diff options
Diffstat (limited to 'drivers/net/pppox.c')
| -rw-r--r-- | drivers/net/pppox.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/net/pppox.c b/drivers/net/pppox.c index 0c1e114527fb..9315046b3f55 100644 --- a/drivers/net/pppox.c +++ b/drivers/net/pppox.c | |||
| @@ -68,8 +68,7 @@ EXPORT_SYMBOL(register_pppox_proto); | |||
| 68 | EXPORT_SYMBOL(unregister_pppox_proto); | 68 | EXPORT_SYMBOL(unregister_pppox_proto); |
| 69 | EXPORT_SYMBOL(pppox_unbind_sock); | 69 | EXPORT_SYMBOL(pppox_unbind_sock); |
| 70 | 70 | ||
| 71 | static int pppox_ioctl(struct socket* sock, unsigned int cmd, | 71 | int pppox_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) |
| 72 | unsigned long arg) | ||
| 73 | { | 72 | { |
| 74 | struct sock *sk = sock->sk; | 73 | struct sock *sk = sock->sk; |
| 75 | struct pppox_sock *po = pppox_sk(sk); | 74 | struct pppox_sock *po = pppox_sk(sk); |
| @@ -105,6 +104,7 @@ static int pppox_ioctl(struct socket* sock, unsigned int cmd, | |||
| 105 | return rc; | 104 | return rc; |
| 106 | } | 105 | } |
| 107 | 106 | ||
| 107 | EXPORT_SYMBOL(pppox_ioctl); | ||
| 108 | 108 | ||
| 109 | static int pppox_create(struct socket *sock, int protocol) | 109 | static int pppox_create(struct socket *sock, int protocol) |
| 110 | { | 110 | { |
| @@ -119,11 +119,7 @@ static int pppox_create(struct socket *sock, int protocol) | |||
| 119 | goto out; | 119 | goto out; |
| 120 | 120 | ||
| 121 | rc = pppox_protos[protocol]->create(sock); | 121 | rc = pppox_protos[protocol]->create(sock); |
| 122 | if (!rc) { | 122 | |
| 123 | /* We get to set the ioctl handler. */ | ||
| 124 | /* For everything else, pppox is just a shell. */ | ||
| 125 | sock->ops->ioctl = pppox_ioctl; | ||
| 126 | } | ||
| 127 | module_put(pppox_protos[protocol]->owner); | 123 | module_put(pppox_protos[protocol]->owner); |
| 128 | out: | 124 | out: |
| 129 | return rc; | 125 | return rc; |
