diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-08 14:23:02 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-08 14:23:02 -0500 |
| commit | 895e031707954a9ca26ed4f5f794575313854ed1 (patch) | |
| tree | ec7cd5515f346e6f94bc43e63d55ebc8ddf4173d /include/net/sock.h | |
| parent | 838e8bb71dc0c892bf8f84abd3c709d8fe3a8d3c (diff) | |
| parent | a622cf69b806bbb1887913c04e01d0c25b892876 (diff) | |
Merge branch 'linus' into x86/cleanups
Diffstat (limited to 'include/net/sock.h')
| -rw-r--r-- | include/net/sock.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index ada50c04d09f..c04f9e18ea22 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); | |||
| 936 | 936 | ||
| 937 | /** | 937 | /** |
| 938 | * sk_filter_release: Release a socket filter | 938 | * sk_filter_release: Release a socket filter |
| 939 | * @sk: socket | ||
| 940 | * @fp: filter to remove | 939 | * @fp: filter to remove |
| 941 | * | 940 | * |
| 942 | * Remove a filter from a socket and release its resources. | 941 | * Remove a filter from a socket and release its resources. |