From 876818be1657e237a43a8d611ca1cc08e755af05 Mon Sep 17 00:00:00 2001
From: jamal <hadi@cyberus.ca>
Date: Mon, 19 Oct 2009 02:17:56 +0000
Subject: [PATCH] --- yaml --- r: 170739 b: refs/heads/master c:
 7e75f93eda027d9f9e0203ee6ffd210ea92e98f3 h: refs/heads/master i:   170737:
 77cd72c200467c75a1afe6f682d310f25e658dbb   170735:
 72f515a87f1cd20a1ec8f1c9ec9e01eeb94fcc91 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 1c374fe71495..5e07ba2f039d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7c734359d3504c869132166d159c7f0649f0ab34
+refs/heads/master: 7e75f93eda027d9f9e0203ee6ffd210ea92e98f3
diff --git a/trunk/include/linux/filter.h b/trunk/include/linux/filter.h
index 1354aaf6abbe..909193e25395 100644
--- a/trunk/include/linux/filter.h
+++ b/trunk/include/linux/filter.h
@@ -123,7 +123,8 @@ struct sock_fprog	/* Required for SO_ATTACH_FILTER. */
 #define SKF_AD_IFINDEX 	8
 #define SKF_AD_NLATTR	12
 #define SKF_AD_NLATTR_NEST	16
-#define SKF_AD_MAX	20
+#define SKF_AD_MARK 	20
+#define SKF_AD_MAX	24
 #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 d1d779ca096d..e3987e1d4839 100644
--- a/trunk/net/core/filter.c
+++ b/trunk/net/core/filter.c
@@ -303,6 +303,9 @@ unsigned int sk_run_filter(struct sk_buff *skb, struct sock_filter *filter, int
 		case SKF_AD_IFINDEX:
 			A = skb->dev->ifindex;
 			continue;
+		case SKF_AD_MARK:
+			A = skb->mark;
+			continue;
 		case SKF_AD_NLATTR: {
 			struct nlattr *nla;