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

Commit fda61436 authored by Yasuyuki Kozakai's avatar Yasuyuki Kozakai Committed by David S. Miller
Browse files

[NETFILTER]: nf_conntrack: Removes unused destroy operation of l3proto 



Signed-off-by: default avatarYasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c874d5f7

include/net/netfilter/nf_conntrack_l3proto.h

+0 −3
Original line number Diff line number Diff line
@@ -56,9 +56,6 @@ struct nf_conntrack_l3proto 
	 */

	int (*new)(struct nf_conn *conntrack, const struct sk_buff *skb);



	/* Called when a conntrack entry is destroyed */

	void (*destroy)(struct nf_conn *conntrack);



	/*

	 * Called before tracking. 

	 *	*dataoff: offset of protocol header (TCP, UDP,...) in *pskb

net/netfilter/nf_conntrack_core.c

+0 −5
Original line number Diff line number Diff line
@@ -299,7 +299,6 @@ destroy_conntrack(struct nf_conntrack *nfct) 
{

	struct nf_conn *ct = (struct nf_conn *)nfct;

	struct nf_conn_help *help = nfct_help(ct);

	struct nf_conntrack_l3proto *l3proto;

	struct nf_conntrack_l4proto *l4proto;

	typeof(nf_conntrack_destroyed) destroyed;
@@ -317,10 +316,6 @@ destroy_conntrack(struct nf_conntrack *nfct) 
	 * destroy_conntrack() MUST NOT be called with a write lock

	 * to nf_conntrack_lock!!! -HW */

	rcu_read_lock();

	l3proto = __nf_ct_l3proto_find(ct->tuplehash[IP_CT_DIR_REPLY].tuple.src.l3num);

	if (l3proto && l3proto->destroy)

		l3proto->destroy(ct);



	l4proto = __nf_ct_l4proto_find(ct->tuplehash[IP_CT_DIR_REPLY].tuple.src.l3num,

				       ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.protonum);

	if (l4proto && l4proto->destroy)