diff options
| author | David S. Miller <davem@davemloft.net> | 2008-04-14 03:50:43 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-14 03:50:43 -0700 |
| commit | 334f8b2afd9652e20f67ddee4fec483ed860425b (patch) | |
| tree | 35d4fb46a9dc145e831fe5da026f2bfd9ee6657c /net/netfilter/xt_CONNSECMARK.c | |
| parent | 7477fd2e6b676fcd15861c2a96a7172f71afe0a5 (diff) | |
| parent | ef1a5a50bbd509b8697dcd4d13017e9e0053867b (diff) | |
| download | linux-334f8b2afd9652e20f67ddee4fec483ed860425b.tar.gz linux-334f8b2afd9652e20f67ddee4fec483ed860425b.tar.bz2 linux-334f8b2afd9652e20f67ddee4fec483ed860425b.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6.26
Diffstat (limited to 'net/netfilter/xt_CONNSECMARK.c')
| -rw-r--r-- | net/netfilter/xt_CONNSECMARK.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/xt_CONNSECMARK.c b/net/netfilter/xt_CONNSECMARK.c index 1faa9136195d..211189eb2b67 100644 --- a/net/netfilter/xt_CONNSECMARK.c +++ b/net/netfilter/xt_CONNSECMARK.c @@ -55,7 +55,7 @@ static void secmark_save(const struct sk_buff *skb) static void secmark_restore(struct sk_buff *skb) { if (!skb->secmark) { - struct nf_conn *ct; + const struct nf_conn *ct; enum ip_conntrack_info ctinfo; ct = nf_ct_get(skb, &ctinfo); |