projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
[powerpc.git]
/
net
/
netfilter
/
xt_CLASSIFY.c
diff --git
a/net/netfilter/xt_CLASSIFY.c
b/net/netfilter/xt_CLASSIFY.c
index
50de965
..
3088483
100644
(file)
--- a/
net/netfilter/xt_CLASSIFY.c
+++ b/
net/netfilter/xt_CLASSIFY.c
@@
-15,6
+15,8
@@
#include <linux/ip.h>
#include <net/checksum.h>
#include <linux/ip.h>
#include <net/checksum.h>
+#include <linux/netfilter_ipv4.h>
+#include <linux/netfilter_ipv6.h>
#include <linux/netfilter/x_tables.h>
#include <linux/netfilter/xt_CLASSIFY.h>
#include <linux/netfilter/x_tables.h>
#include <linux/netfilter/xt_CLASSIFY.h>
@@
-33,9
+35,7
@@
target(struct sk_buff **pskb,
{
const struct xt_classify_target_info *clinfo = targinfo;
{
const struct xt_classify_target_info *clinfo = targinfo;
- if ((*pskb)->priority != clinfo->priority)
- (*pskb)->priority = clinfo->priority;
-
+ (*pskb)->priority = clinfo->priority;
return XT_CONTINUE;
}
return XT_CONTINUE;
}
@@
-48,7
+48,7
@@
static struct xt_target xt_classify_target[] = {
.table = "mangle",
.hooks = (1 << NF_IP_LOCAL_OUT) |
(1 << NF_IP_FORWARD) |
.table = "mangle",
.hooks = (1 << NF_IP_LOCAL_OUT) |
(1 << NF_IP_FORWARD) |
- (1 << NF_IP_POST_ROUTING),
+ (1 << NF_IP_POST_ROUTING),
.me = THIS_MODULE,
},
{
.me = THIS_MODULE,
},
{
@@
-57,9
+57,9
@@
static struct xt_target xt_classify_target[] = {
.target = target,
.targetsize = sizeof(struct xt_classify_target_info),
.table = "mangle",
.target = target,
.targetsize = sizeof(struct xt_classify_target_info),
.table = "mangle",
- .hooks = (1 << NF_IP_LOCAL_OUT) |
- (1 << NF_IP_FORWARD) |
- (1 << NF_IP_POST_ROUTING),
+ .hooks = (1 << NF_IP
6
_LOCAL_OUT) |
+ (1 << NF_IP
6
_FORWARD) |
+ (1 << NF_IP
6
_POST_ROUTING),
.me = THIS_MODULE,
},
};
.me = THIS_MODULE,
},
};