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_CONNSECMARK.c
diff --git
a/net/netfilter/xt_CONNSECMARK.c
b/net/netfilter/xt_CONNSECMARK.c
index
a3fe3c3
..
81c0c58
100644
(file)
--- a/
net/netfilter/xt_CONNSECMARK.c
+++ b/
net/netfilter/xt_CONNSECMARK.c
@@
-19,7
+19,7
@@
#include <linux/skbuff.h>
#include <linux/netfilter/x_tables.h>
#include <linux/netfilter/xt_CONNSECMARK.h>
#include <linux/skbuff.h>
#include <linux/netfilter/x_tables.h>
#include <linux/netfilter/xt_CONNSECMARK.h>
-#include <net/netfilter/nf_conntrack
_compat
.h>
+#include <net/netfilter/nf_conntrack.h>
#define PFX "CONNSECMARK: "
#define PFX "CONNSECMARK: "
@@
-36,13
+36,12
@@
MODULE_ALIAS("ip6t_CONNSECMARK");
static void secmark_save(struct sk_buff *skb)
{
if (skb->secmark) {
static void secmark_save(struct sk_buff *skb)
{
if (skb->secmark) {
-
u32 *connsecmark
;
+
struct nf_conn *ct
;
enum ip_conntrack_info ctinfo;
enum ip_conntrack_info ctinfo;
- connsecmark = nf_ct_get_secmark(skb, &ctinfo);
- if (connsecmark && !*connsecmark)
- if (*connsecmark != skb->secmark)
- *connsecmark = skb->secmark;
+ ct = nf_ct_get(skb, &ctinfo);
+ if (ct && !ct->secmark)
+ ct->secmark = skb->secmark;
}
}
}
}
@@
-53,13
+52,12
@@
static void secmark_save(struct sk_buff *skb)
static void secmark_restore(struct sk_buff *skb)
{
if (!skb->secmark) {
static void secmark_restore(struct sk_buff *skb)
{
if (!skb->secmark) {
-
u32 *connsecmark
;
+
struct nf_conn *ct
;
enum ip_conntrack_info ctinfo;
enum ip_conntrack_info ctinfo;
- connsecmark = nf_ct_get_secmark(skb, &ctinfo);
- if (connsecmark && *connsecmark)
- if (skb->secmark != *connsecmark)
- skb->secmark = *connsecmark;
+ ct = nf_ct_get(skb, &ctinfo);
+ if (ct && ct->secmark)
+ skb->secmark = ct->secmark;
}
}
}
}