diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2008-11-03 20:46:44 +0000 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2008-11-03 20:46:44 +0000 |
| commit | 973a971d5a5ef0d6a60e5c9b0df675fef6be3383 (patch) | |
| tree | d49729a4bff6fd5bdacfcc57e7ba44911fd8812c /include/net | |
| parent | f4bafd5dc0d4f03f6dc4466d233a4601c54d40b3 (diff) | |
| parent | a75952b72a0fff3031124003e62118111aed42c1 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into rmk-next
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/net_namespace.h | 2 | ||||
| -rw-r--r-- | include/net/sock.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h index 708009be88b..700c53a3c6f 100644 --- a/include/net/net_namespace.h +++ b/include/net/net_namespace.h @@ -214,6 +214,8 @@ struct pernet_operations { extern int register_pernet_subsys(struct pernet_operations *); extern void unregister_pernet_subsys(struct pernet_operations *); +extern int register_pernet_gen_subsys(int *id, struct pernet_operations *); +extern void unregister_pernet_gen_subsys(int id, struct pernet_operations *); extern int register_pernet_device(struct pernet_operations *); extern void unregister_pernet_device(struct pernet_operations *); extern int register_pernet_gen_device(int *id, struct pernet_operations *); diff --git a/include/net/sock.h b/include/net/sock.h index ada50c04d09..c04f9e18ea2 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -936,7 +936,6 @@ extern void sock_init_data(struct socket *sock, struct sock *sk); /** * sk_filter_release: Release a socket filter - * @sk: socket * @fp: filter to remove * * Remove a filter from a socket and release its resources. |