---

yaml --- r: 170747 b: refs/heads/master c: d19742f h: refs/heads/master i: 170745: 6e51a62 170743: d889a76 v: v3
git-mirror · Oct 20, 2009 · e15b966 · e15b966
1 parent 054a6c3
commit e15b966
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ad959e76f0fa94d299a8c25cb45de4d1b845e9ce
+refs/heads/master: d19742fb1c68e6db83b76e06dea5a374c99e104f
diff --git a/trunk/include/linux/filter.h b/trunk/include/linux/filter.h
@@ -124,7 +124,8 @@ struct sock_fprog	/* Required for SO_ATTACH_FILTER. */
 #define SKF_AD_NLATTR	12
 #define SKF_AD_NLATTR_NEST	16
 #define SKF_AD_MARK 	20
-#define SKF_AD_MAX	24
+#define SKF_AD_QUEUE	24
+#define SKF_AD_MAX	28
 #define SKF_NET_OFF   (-0x100000)
 #define SKF_LL_OFF    (-0x200000)
 

diff --git a/trunk/net/core/filter.c b/trunk/net/core/filter.c
@@ -306,6 +306,9 @@ unsigned int sk_run_filter(struct sk_buff *skb, struct sock_filter *filter, int
 		case SKF_AD_MARK:
 			A = skb->mark;
 			continue;
+		case SKF_AD_QUEUE:
+			A = skb->queue_mapping;
+			continue;
 		case SKF_AD_NLATTR: {
 			struct nlattr *nla;