diff options
| author | Paul Bonser | 2006-11-24 02:56:13 +0100 |
|---|---|---|
| committer | David S. Miller | 2006-11-26 00:16:51 +0100 |
| commit | dc9b334622bff6d22456917a034c2e2d194b9328 (patch) | |
| tree | 2c939407ea168046febe7a080efb4e78ffe5d4d2 /include/net/sock.h | |
| parent | [6PACK]: Masking bug in 6pack driver. (diff) | |
| download | kernel-qcow2-linux-dc9b334622bff6d22456917a034c2e2d194b9328.tar.gz kernel-qcow2-linux-dc9b334622bff6d22456917a034c2e2d194b9328.tar.xz kernel-qcow2-linux-dc9b334622bff6d22456917a034c2e2d194b9328.zip | |
[NET]: Re-fix of doc-comment in sock.h
Restoring old, correct comment for sk_filter_release, moving it to
where it should actually be, and changing new comment into proper
comment for sk_filter_rcu_free, where it actually makes sense.
The original fix submitted for this on Oct 23 mistakenly documented
the wrong function.
Signed-off-by: Paul Bonser <misterpib@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/sock.h')
| -rw-r--r-- | include/net/sock.h | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index ac286a353032..9cdbae2a53a3 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -883,18 +883,23 @@ static inline int sk_filter(struct sock *sk, struct sk_buff *skb) } /** - * sk_filter_release: Release a socket filter - * @rcu: rcu_head that contains the sk_filter info to remove - * - * Remove a filter from a socket and release its resources. + * sk_filter_rcu_free: Free a socket filter + * @rcu: rcu_head that contains the sk_filter to free */ - static inline void sk_filter_rcu_free(struct rcu_head *rcu) { struct sk_filter *fp = container_of(rcu, struct sk_filter, rcu); kfree(fp); } +/** + * sk_filter_release: Release a socket filter + * @sk: socket + * @fp: filter to remove + * + * Remove a filter from a socket and release its resources. + */ + static inline void sk_filter_release(struct sock *sk, struct sk_filter *fp) { unsigned int size = sk_filter_len(fp); |