Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 334a47f6 authored by Patrick McHardy's avatar Patrick McHardy
Browse files

netfilter: nf_ct_tcp: fix up build after merge 



Replace the last occurence of tcp_lock by the per-conntrack lock.

Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent 36432dae

net/netfilter/nf_conntrack_proto_tcp.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -944,7 +944,7 @@ static int tcp_packet(struct nf_conn *ct, 
		    && (ct->proto.tcp.seen[!dir].flags & IP_CT_TCP_FLAG_MAXACK_SET)

		    && (ct->proto.tcp.seen[!dir].flags & IP_CT_TCP_FLAG_MAXACK_SET)

		    && before(ntohl(th->seq), ct->proto.tcp.seen[!dir].td_maxack)) {

		    && before(ntohl(th->seq), ct->proto.tcp.seen[!dir].td_maxack)) {

			/* Invalid RST  */

			/* Invalid RST  */

			write_unlock_bh(&tcp_lock);

			spin_unlock_bh(&ct->lock);

			if (LOG_INVALID(net, IPPROTO_TCP))

			if (LOG_INVALID(net, IPPROTO_TCP))

				nf_log_packet(pf, 0, skb, NULL, NULL, NULL,

				nf_log_packet(pf, 0, skb, NULL, NULL, NULL,

					  "nf_ct_tcp: invalid RST ");

					  "nf_ct_tcp: invalid RST ");