Commit 217cff36 authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso
Browse files

netfilter: flowtable: pass flowtable to nf_flow_table_iterate() 



The flowtable object is already passed as argument to
nf_flow_table_iterate(), do use not data pointer to pass flowtable.

Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent bb321ed6

net/netfilter/nf_flow_table_core.c

+10 −10
Original line number Diff line number Diff line
@@ -405,7 +405,8 @@ EXPORT_SYMBOL_GPL(flow_offload_lookup); 


static int

nf_flow_table_iterate(struct nf_flowtable *flow_table,

		      void (*iter)(struct flow_offload *flow, void *data),

		      void (*iter)(struct nf_flowtable *flowtable,

				   struct flow_offload *flow, void *data),

		      void *data)

{

	struct flow_offload_tuple_rhash *tuplehash;
@@ -429,7 +430,7 @@ nf_flow_table_iterate(struct nf_flowtable *flow_table, 


		flow = container_of(tuplehash, struct flow_offload, tuplehash[0]);



		iter(flow, data);

		iter(flow_table, flow, data);

	}

	rhashtable_walk_stop(&hti);

	rhashtable_walk_exit(&hti);
@@ -457,10 +458,9 @@ static bool nf_flow_has_stale_dst(struct flow_offload *flow) 
	       flow_offload_stale_dst(&flow->tuplehash[FLOW_OFFLOAD_DIR_REPLY].tuple);

}



static void nf_flow_offload_gc_step(struct flow_offload *flow, void *data)

static void nf_flow_offload_gc_step(struct nf_flowtable *flow_table,

				    struct flow_offload *flow, void *data)

{

	struct nf_flowtable *flow_table = data;



	if (nf_flow_has_expired(flow) ||

	    nf_ct_is_dying(flow->ct) ||

	    nf_flow_has_stale_dst(flow))
@@ -485,7 +485,7 @@ static void nf_flow_offload_work_gc(struct work_struct *work) 
	struct nf_flowtable *flow_table;



	flow_table = container_of(work, struct nf_flowtable, gc_work.work);

	nf_flow_table_iterate(flow_table, nf_flow_offload_gc_step, flow_table);

	nf_flow_table_iterate(flow_table, nf_flow_offload_gc_step, NULL);

	queue_delayed_work(system_power_efficient_wq, &flow_table->gc_work, HZ);

}
@@ -601,7 +601,8 @@ int nf_flow_table_init(struct nf_flowtable *flowtable) 
}

EXPORT_SYMBOL_GPL(nf_flow_table_init);



static void nf_flow_table_do_cleanup(struct flow_offload *flow, void *data)

static void nf_flow_table_do_cleanup(struct nf_flowtable *flow_table,

				     struct flow_offload *flow, void *data)

{

	struct net_device *dev = data;
@@ -643,11 +644,10 @@ void nf_flow_table_free(struct nf_flowtable *flow_table) 


	cancel_delayed_work_sync(&flow_table->gc_work);

	nf_flow_table_iterate(flow_table, nf_flow_table_do_cleanup, NULL);

	nf_flow_table_iterate(flow_table, nf_flow_offload_gc_step, flow_table);

	nf_flow_table_iterate(flow_table, nf_flow_offload_gc_step, NULL);

	nf_flow_table_offload_flush(flow_table);

	if (nf_flowtable_hw_offload(flow_table))

		nf_flow_table_iterate(flow_table, nf_flow_offload_gc_step,

				      flow_table);

		nf_flow_table_iterate(flow_table, nf_flow_offload_gc_step, NULL);

	rhashtable_destroy(&flow_table->rhashtable);

}

EXPORT_SYMBOL_GPL(nf_flow_table_free);