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

Commit 1a8bf6ee authored by Eric Dumazet's avatar Eric Dumazet Committed by Pablo Neira Ayuso
Browse files

netfilter: xt_socket: use sock_gen_put() 



TCP listener refactoring, part 7 :

Use sock_gen_put() instead of xt_socket_put_sk() for future
SYN_RECV support.

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 1255ce5f

net/netfilter/xt_socket.c

+2 −11
Original line number Diff line number Diff line
@@ -35,15 +35,6 @@ 
#include <net/netfilter/nf_conntrack.h>

#endif



static void

xt_socket_put_sk(struct sock *sk)

{

	if (sk->sk_state == TCP_TIME_WAIT)

		inet_twsk_put(inet_twsk(sk));

	else

		sock_put(sk);

}



static int

extract_icmp4_fields(const struct sk_buff *skb,

		    u8 *protocol,
@@ -216,7 +207,7 @@ socket_match(const struct sk_buff *skb, struct xt_action_param *par, 
					inet_twsk(sk)->tw_transparent));



		if (sk != skb->sk)

			xt_socket_put_sk(sk);

			sock_gen_put(sk);



		if (wildcard || !transparent)

			sk = NULL;
@@ -381,7 +372,7 @@ socket_mt6_v1_v2(const struct sk_buff *skb, struct xt_action_param *par) 
					inet_twsk(sk)->tw_transparent));



		if (sk != skb->sk)

			xt_socket_put_sk(sk);

			sock_gen_put(sk);



		if (wildcard || !transparent)

			sk = NULL;