diff options
| author | David S. Miller <davem@nuts.ninka.net> | 2003-04-28 10:06:56 -0700 |
|---|---|---|
| committer | David S. Miller <davem@nuts.ninka.net> | 2003-04-28 10:06:56 -0700 |
| commit | 8fa508b5c2c546cf292ce79350d38b3feca6b88a (patch) | |
| tree | 4ced9efd84d88c175ac2a05b3304d05dbd2c685a /include/linux | |
| parent | f31ab86149bc25ea3130734fb801b4b7be090430 (diff) | |
| parent | 9614c53842e4b8833faaf35ea0e211343058909e (diff) | |
Merge bk://kernel.bkbits.net/acme/net-2.5
into nuts.ninka.net:/home/davem/src/BK/net-2.5
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/if_pppox.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/include/linux/if_pppox.h b/include/linux/if_pppox.h index 948826892b82..117357b14483 100644 --- a/include/linux/if_pppox.h +++ b/include/linux/if_pppox.h @@ -134,10 +134,15 @@ struct pppox_opt { #define pppox_sk(__sk) ((struct pppox_opt *)(__sk)->protinfo) +struct module; + struct pppox_proto { - int (*create)(struct socket *sock); - int (*ioctl)(struct socket *sock, unsigned int cmd, - unsigned long arg); + int (*create)(struct socket *sock); + int (*ioctl)(struct socket *sock, unsigned int cmd, + unsigned long arg); + int (*release)(struct socket *sock); + void (*sk_free)(struct sock *sk); + struct module *owner; }; extern int register_pppox_proto(int proto_num, struct pppox_proto *pp); @@ -145,6 +150,9 @@ 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 struct sock *pppox_sk_alloc(struct socket *sock, int protocol, + int priority, int zero_it, + kmem_cache_t *slab); /* PPPoX socket states */ enum { |