From: Greg Rose Date: Wed, 3 Jul 2019 17:04:55 +0000 (-0700) Subject: compat: Clean up tunnel_id_to_key X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=ec7a138d88b24db77e2142d149b7b42a45eb1cdc;p=ovs.git compat: Clean up tunnel_id_to_key This function was just a duplicate of tunnel_id_to_key32 - I'm not sure why it was ever needed but let's dump it now. Signed-off-by: Greg Rose Acked-by: William Tu Signed-off-by: Ben Pfaff --- diff --git a/datapath/linux/compat/ip_gre.c b/datapath/linux/compat/ip_gre.c index 676666150..2015d597c 100644 --- a/datapath/linux/compat/ip_gre.c +++ b/datapath/linux/compat/ip_gre.c @@ -71,16 +71,6 @@ static void erspan_build_header(struct sk_buff *skb, static bool ip_gre_loaded = false; -/* Returns the least-significant 32 bits of a __be64. */ -static __be32 tunnel_id_to_key(__be64 x) -{ -#ifdef __BIG_ENDIAN - return (__force __be32)x; -#else - return (__force __be32)((__force u64)x >> 32); -#endif -} - /* Normally in net/core/dst.c but move it here */ struct dst_ops md_dst_ops = { .family = AF_UNSPEC, @@ -474,7 +464,7 @@ netdev_tx_t rpl_gre_fb_xmit(struct sk_buff *skb) flags = tun_info->key.tun_flags & (TUNNEL_CSUM | TUNNEL_KEY); build_header(skb, tunnel_hlen, flags, htons(ETH_P_TEB), - tunnel_id_to_key(tun_info->key.tun_id), 0); + tunnel_id_to_key32(tun_info->key.tun_id), 0); df = key->tun_flags & TUNNEL_DONT_FRAGMENT ? htons(IP_DF) : 0; iptunnel_xmit(skb->sk, rt, skb, fl.saddr, key->u.ipv4.dst, IPPROTO_GRE,