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

Commit de7a0f87 authored by David Ahern's avatar David Ahern Committed by David S. Miller
Browse files

net: Remove unused get_hash_from_flow functions 



__get_hash_from_flowi6 is still used for flowlabels, but the IPv4
variant and the wrappers to both are not used. Remove them.

Signed-off-by: default avatarDavid Ahern <dsahern@gmail.com>
Reviewed-by: default avatarIdo Schimmel <idosch@mellanox.com>
Reviewed-by: default avatarNikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5e18b9c5

include/net/flow.h

+0 −16
Original line number Diff line number Diff line
@@ -222,20 +222,4 @@ static inline unsigned int flow_key_size(u16 family) 


__u32 __get_hash_from_flowi6(const struct flowi6 *fl6, struct flow_keys *keys);



static inline __u32 get_hash_from_flowi6(const struct flowi6 *fl6)

{

	struct flow_keys keys;



	return __get_hash_from_flowi6(fl6, &keys);

}



__u32 __get_hash_from_flowi4(const struct flowi4 *fl4, struct flow_keys *keys);



static inline __u32 get_hash_from_flowi4(const struct flowi4 *fl4)

{

	struct flow_keys keys;



	return __get_hash_from_flowi4(fl4, &keys);

}



#endif

net/core/flow_dissector.c

+0 −16
Original line number Diff line number Diff line
@@ -1341,22 +1341,6 @@ __u32 __get_hash_from_flowi6(const struct flowi6 *fl6, struct flow_keys *keys) 
}

EXPORT_SYMBOL(__get_hash_from_flowi6);



__u32 __get_hash_from_flowi4(const struct flowi4 *fl4, struct flow_keys *keys)

{

	memset(keys, 0, sizeof(*keys));



	keys->addrs.v4addrs.src = fl4->saddr;

	keys->addrs.v4addrs.dst = fl4->daddr;

	keys->control.addr_type = FLOW_DISSECTOR_KEY_IPV4_ADDRS;

	keys->ports.src = fl4->fl4_sport;

	keys->ports.dst = fl4->fl4_dport;

	keys->keyid.keyid = fl4->fl4_gre_key;

	keys->basic.ip_proto = fl4->flowi4_proto;



	return flow_hash_from_keys(keys);

}

EXPORT_SYMBOL(__get_hash_from_flowi4);



static const struct flow_dissector_key flow_keys_dissector_keys[] = {

	{

		.key_id = FLOW_DISSECTOR_KEY_CONTROL,