---

yaml --- r: 266884 b: refs/heads/master c: 4f25af2 h: refs/heads/master v: v3
git-mirror · Oct 19, 2011 · 9881ecb · 9881ecb
1 parent f8db794
commit 9881ecb
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 79de9efdb93d8e693dccd0eb7d80cd6092f5875b
+refs/heads/master: 4f25af27827080c3163e59c7af1ca84a05ce121c
diff --git a/trunk/include/linux/filter.h b/trunk/include/linux/filter.h
@@ -155,7 +155,7 @@ extern unsigned int sk_run_filter(const struct sk_buff *skb,
 				  const struct sock_filter *filter);
 extern int sk_attach_filter(struct sock_fprog *fprog, struct sock *sk);
 extern int sk_detach_filter(struct sock *sk);
-extern int sk_chk_filter(struct sock_filter *filter, int flen);
+extern int sk_chk_filter(struct sock_filter *filter, unsigned int flen);
 
 #ifdef CONFIG_BPF_JIT
 extern void bpf_jit_compile(struct sk_filter *fp);

diff --git a/trunk/net/core/filter.c b/trunk/net/core/filter.c
@@ -436,7 +436,7 @@ static int check_load_and_stores(struct sock_filter *filter, int flen)
  *
  * Returns 0 if the rule set is legal or -EINVAL if not.
  */
-int sk_chk_filter(struct sock_filter *filter, int flen)
+int sk_chk_filter(struct sock_filter *filter, unsigned int flen)
 {
 	/*
 	 * Valid instructions are initialized to non-0.