diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2005-12-27 20:57:40 -0800 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-01-03 13:11:23 -0800 |
| commit | 17ba15fb6264f27374bc87f4c3f8519b80289d85 (patch) | |
| tree | 3134abef98d88aa029aa7faa72d8a41686644e99 /include | |
| parent | 8639a11e23d9eb0a6ceac2feed27acdfbb158f95 (diff) | |
| download | linux-3.10-17ba15fb6264f27374bc87f4c3f8519b80289d85.tar.gz linux-3.10-17ba15fb6264f27374bc87f4c3f8519b80289d85.tar.bz2 linux-3.10-17ba15fb6264f27374bc87f4c3f8519b80289d85.zip | |
[PPPOX]: Fix assignment into const proto_ops.
And actually, with this, the whole pppox layer can basically
be removed and subsumed into pppoe.c, no other pppox sub-protocol
implementation exists and we've had this thing for at least 4
years.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/if_pppox.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/if_pppox.h b/include/linux/if_pppox.h index e677f73f13d..4fab3d0a4bc 100644 --- a/include/linux/if_pppox.h +++ b/include/linux/if_pppox.h @@ -157,8 +157,7 @@ struct pppox_proto { extern int register_pppox_proto(int proto_num, struct pppox_proto *pp); extern void unregister_pppox_proto(int proto_num); extern void pppox_unbind_sock(struct sock *sk);/* delete ppp-channel binding */ -extern int pppox_channel_ioctl(struct ppp_channel *pc, unsigned int cmd, - unsigned long arg); +extern int pppox_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg); /* PPPoX socket states */ enum { |