Setting tag linux-2.6-27-38
[linux-2.6.git] / linux-2.6-527-iptables-classify-add-mark.patch
1 diff -NurpP --exclude '*.orig' --exclude '*.rej' linux-2.6.27.10-vs2.3.x-PS-522-523-524-525-526/include/linux/netfilter/xt_CLASSIFY.h linux-2.6.27.10-vs2.3.x-PS-522-523-524-525-526-527/include/linux/netfilter/xt_CLASSIFY.h
2 --- linux-2.6.27.10-vs2.3.x-PS-522-523-524-525-526/include/linux/netfilter/xt_CLASSIFY.h        2008-07-13 23:51:29.000000000 +0200
3 +++ linux-2.6.27.10-vs2.3.x-PS-522-523-524-525-526-527/include/linux/netfilter/xt_CLASSIFY.h    2009-01-21 03:49:25.000000000 +0100
4 @@ -3,6 +3,7 @@
5  
6  struct xt_classify_target_info {
7         u_int32_t priority;
8 +       u_int8_t add_mark;
9  };
10  
11  #endif /*_XT_CLASSIFY_H */
12 diff -NurpP --exclude '*.orig' --exclude '*.rej' linux-2.6.27.10-vs2.3.x-PS-522-523-524-525-526/net/netfilter/xt_CLASSIFY.c linux-2.6.27.10-vs2.3.x-PS-522-523-524-525-526-527/net/netfilter/xt_CLASSIFY.c
13 --- linux-2.6.27.10-vs2.3.x-PS-522-523-524-525-526/net/netfilter/xt_CLASSIFY.c  2008-07-13 23:51:29.000000000 +0200
14 +++ linux-2.6.27.10-vs2.3.x-PS-522-523-524-525-526-527/net/netfilter/xt_CLASSIFY.c      2009-01-21 03:51:49.000000000 +0100
15 @@ -34,6 +34,9 @@ classify_tg(struct sk_buff *skb, const s
16         const struct xt_classify_target_info *clinfo = targinfo;
17  
18         skb->priority = clinfo->priority;
19 +       if (clinfo->add_mark)
20 +               skb->priority += skb->mark;
21 +
22         return XT_CONTINUE;
23  }
24