From dd9edc5ee27e63d1fe6fdf95fabe0bff3261f446 Mon Sep 17 00:00:00 2001 From: Paul Bonser Date: Thu, 23 Nov 2006 17:56:13 -0800 Subject: [PATCH] --- yaml --- r: 41098 b: refs/heads/master c: dc9b334622bff6d22456917a034c2e2d194b9328 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/net/sock.h | 15 ++++++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 5080befe18a7..31da58b68b72 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 95f6134e175fd69ab3f088f7a09adbd3fd3548e1 +refs/heads/master: dc9b334622bff6d22456917a034c2e2d194b9328 diff --git a/trunk/include/net/sock.h b/trunk/include/net/sock.h index ac286a353032..9cdbae2a53a3 100644 --- a/trunk/include/net/sock.h +++ b/trunk/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);