From e15b966ad4f5561909abd6541b504cf713863b56 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Tue, 20 Oct 2009 01:06:22 -0700
Subject: [PATCH] --- yaml --- r: 170747 b: refs/heads/master c:
 d19742fb1c68e6db83b76e06dea5a374c99e104f h: refs/heads/master i:   170745:
 6e51a62161a8f67085ae92367c1688a864e864d8   170743:
 d889a76a6659491e68b7f3b67f5b1f528b45a596 v: v3

---
 [refs]                       | 2 +-
 trunk/include/linux/filter.h | 3 ++-
 trunk/net/core/filter.c      | 3 +++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a91f22014790..461e0518504c 100644
--- 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
index 909193e25395..bb3b4352978a 100644
--- 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
index e3987e1d4839..08db7b9143a3 100644
--- 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;