diff --git a/[refs] b/[refs] index fd15ae4e3556..82c715ada0cd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ce14f8946a294ffa741ec29558a1c7e455cecd3b +refs/heads/master: 792d4b5cb16b684958c2590f77688667ddec1f61 diff --git a/trunk/include/linux/filter.h b/trunk/include/linux/filter.h index 4609b85e559d..9ee3f9fb0b4a 100644 --- a/trunk/include/linux/filter.h +++ b/trunk/include/linux/filter.h @@ -131,6 +131,10 @@ struct sock_fprog { /* Required for SO_ATTACH_FILTER. */ #define SKF_LL_OFF (-0x200000) #ifdef __KERNEL__ + +struct sk_buff; +struct sock; + struct sk_filter { atomic_t refcnt; @@ -146,9 +150,6 @@ static inline unsigned int sk_filter_len(const struct sk_filter *fp) return fp->len * sizeof(struct sock_filter) + sizeof(*fp); } -struct sk_buff; -struct sock; - extern int sk_filter(struct sock *sk, struct sk_buff *skb); extern unsigned int sk_run_filter(const struct sk_buff *skb, const struct sock_filter *filter);