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: David Ahern <dsahern@gmail.com>
Reviewed-by: Ido Schimmel <idosch@mellanox.com>
Reviewed-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/flow.h b/include/net/flow.h
index 64e7ee9cb980c0b780ce31bcdc4e0ec6c6de9273..8ce21793094e32248ac2656ad5c7a9d986b35970 100644 (file)
--- a/include/net/flow.h
+++ b/include/net/flow.h
@@ -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

diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c
index 559db9ea8d86f509ae7caae7801c7502b22b293f..d29f09bc5ff90c457513c46200310cb00dd0c188 100644 (file)
--- a/net/core/flow_dissector.c
+++ b/net/core/flow_dissector.c
@@ -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,