diff options
Diffstat (limited to 'net/ipv6')
-rw-r--r-- | net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c b/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c index 8a45bb20bedb..2b6c226f5198 100644 --- a/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c +++ b/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | |||
@@ -104,7 +104,6 @@ static unsigned int ipv6_helper(unsigned int hooknum, | |||
104 | const struct nf_conn_help *help; | 104 | const struct nf_conn_help *help; |
105 | const struct nf_conntrack_helper *helper; | 105 | const struct nf_conntrack_helper *helper; |
106 | enum ip_conntrack_info ctinfo; | 106 | enum ip_conntrack_info ctinfo; |
107 | unsigned int ret; | ||
108 | __be16 frag_off; | 107 | __be16 frag_off; |
109 | int protoff; | 108 | int protoff; |
110 | u8 nexthdr; | 109 | u8 nexthdr; |
@@ -130,12 +129,7 @@ static unsigned int ipv6_helper(unsigned int hooknum, | |||
130 | return NF_ACCEPT; | 129 | return NF_ACCEPT; |
131 | } | 130 | } |
132 | 131 | ||
133 | ret = helper->help(skb, protoff, ct, ctinfo); | 132 | return helper->help(skb, protoff, ct, ctinfo); |
134 | if (ret != NF_ACCEPT && (ret & NF_VERDICT_MASK) != NF_QUEUE) { | ||
135 | nf_log_packet(NFPROTO_IPV6, hooknum, skb, in, out, NULL, | ||
136 | "nf_ct_%s: dropping packet", helper->name); | ||
137 | } | ||
138 | return ret; | ||
139 | } | 133 | } |
140 | 134 | ||
141 | static unsigned int ipv6_confirm(unsigned int hooknum, | 135 | static unsigned int ipv6_confirm(unsigned int hooknum, |