---

yaml --- r: 170739 b: refs/heads/master c: 7e75f93 h: refs/heads/master i: 170737: 77cd72c 170735: 72f515a v: v3
git-mirror · Oct 20, 2009 · 876818b · 876818b
1 parent 923886d
commit 876818b
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: 7c734359d3504c869132166d159c7f0649f0ab34
+refs/heads/master: 7e75f93eda027d9f9e0203ee6ffd210ea92e98f3
diff --git 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
@@ -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;