diff options
Diffstat (limited to 'net/ipv6')
-rw-r--r-- | net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c b/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c index da924c6b5f06..430db1de31e3 100644 --- a/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c +++ b/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c | |||
@@ -101,7 +101,7 @@ static int icmpv6_packet(struct nf_conn *ct, | |||
101 | } | 101 | } |
102 | 102 | ||
103 | /* Called when a new connection for this protocol found. */ | 103 | /* Called when a new connection for this protocol found. */ |
104 | static int icmpv6_new(struct nf_conn *conntrack, | 104 | static int icmpv6_new(struct nf_conn *ct, |
105 | const struct sk_buff *skb, | 105 | const struct sk_buff *skb, |
106 | unsigned int dataoff) | 106 | unsigned int dataoff) |
107 | { | 107 | { |
@@ -109,16 +109,16 @@ static int icmpv6_new(struct nf_conn *conntrack, | |||
109 | [ICMPV6_ECHO_REQUEST - 128] = 1, | 109 | [ICMPV6_ECHO_REQUEST - 128] = 1, |
110 | [ICMPV6_NI_QUERY - 128] = 1 | 110 | [ICMPV6_NI_QUERY - 128] = 1 |
111 | }; | 111 | }; |
112 | int type = conntrack->tuplehash[0].tuple.dst.u.icmp.type - 128; | 112 | int type = ct->tuplehash[0].tuple.dst.u.icmp.type - 128; |
113 | 113 | ||
114 | if (type < 0 || type >= sizeof(valid_new) || !valid_new[type]) { | 114 | if (type < 0 || type >= sizeof(valid_new) || !valid_new[type]) { |
115 | /* Can't create a new ICMPv6 `conn' with this. */ | 115 | /* Can't create a new ICMPv6 `conn' with this. */ |
116 | pr_debug("icmpv6: can't create new conn with type %u\n", | 116 | pr_debug("icmpv6: can't create new conn with type %u\n", |
117 | type + 128); | 117 | type + 128); |
118 | NF_CT_DUMP_TUPLE(&conntrack->tuplehash[0].tuple); | 118 | NF_CT_DUMP_TUPLE(&ct->tuplehash[0].tuple); |
119 | return 0; | 119 | return 0; |
120 | } | 120 | } |
121 | atomic_set(&conntrack->proto.icmp.count, 0); | 121 | atomic_set(&ct->proto.icmp.count, 0); |
122 | return 1; | 122 | return 1; |
123 | } | 123 | } |
124 | 124 | ||