From patchwork Fri Jun 28 20:40:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Rose X-Patchwork-Id: 1124529 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="sM26FC2R"; dkim-atps=neutral Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45b7xF5XK9z9s3l for ; Sat, 29 Jun 2019 06:42:25 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id EAAE1CDD; Fri, 28 Jun 2019 20:41:03 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 25B40CCB for ; Fri, 28 Jun 2019 20:41:00 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id DF09982D for ; Fri, 28 Jun 2019 20:40:59 +0000 (UTC) Received: by mail-pf1-f195.google.com with SMTP id t16so3549038pfe.11 for ; Fri, 28 Jun 2019 13:40:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=nlQ0qRdYmB1xQt0MgJuvYtDRPUtszSBmKQII1JXlkBg=; b=sM26FC2R9mlHcrnNgbq4QSZfgKGIpI6EhxdoEprRhKg5iOr9VmXcGgh1ITlJz0Xygz WfsFgbZ5g4KQsUlBBCP026krLV/KLiYwq8lnfJxALX0UQcwuxJwuOAPr80VMu9OLun/w TZWmpxY/uoXhF/wTrdCJ4ji2jTpAHeG+OhnuIor9yFeHsRgbV86+w5cmxysQdvMO/1Ff ukQxvktss4vCfCWmxSvLjdC+Cqk2TfLKvaaHwjsrmK4xvBED/ElbNdkB/dnyEa9PoGXA UPT680DNATD20BiXQZVs7yBLib/ThgS502QXjuwBB5AqFMQTmk7FPiH6VYv0+9myXxah mFeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=nlQ0qRdYmB1xQt0MgJuvYtDRPUtszSBmKQII1JXlkBg=; b=XiHD84LSOMqPktyxjt5GZqIDVlLShGKp3t62lm0heDw3GRCtIWFxYM2XQJzYb+bE6/ K95i52hiALPcGkV0pA/ObEp+4l1V12rtZ05sqra1Os6qkdJ8PEHl9ZwmBrVwP1UJjBJx ldK0Tm003nhlso4gF9UsK5r6BG7H44i604lJf1gk0+Rwonpwsijw9VYei1vAlHyPg/HJ M3McYbWKzaQ8BLV3eB+jSHNv0LoIpUiAX3aIONoWTRh+kOfLLnZiBIXQxfYTlzNL0SYD rX5o9p3lYaZQb0/jyxeFkx7J8AGe9Zr0SgUl2q3p4+fZIRYKNr7vOJA35kwWqOEGosdN aIGQ== X-Gm-Message-State: APjAAAW4xmEY4atZFMcCMAsi60gm95qWV+inCOdRvE7K1kjZp21D72x3 Gd9mU5ptNs0r68ftC+H4ySm9tx6t X-Google-Smtp-Source: APXvYqw+3JD9iEHFeQxfwwPXoujnumnGwM8dmSA+m6+nzzmgri2tarURdaLe0LFQC+BTbQybzS9I2A== X-Received: by 2002:a17:90a:730b:: with SMTP id m11mr15300977pjk.89.1561754459078; Fri, 28 Jun 2019 13:40:59 -0700 (PDT) Received: from gizo.domain (97-115-113-19.ptld.qwest.net. [97.115.113.19]) by smtp.gmail.com with ESMTPSA id c10sm2639627pjq.14.2019.06.28.13.40.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 28 Jun 2019 13:40:58 -0700 (PDT) From: Greg Rose To: dev@openvswitch.org Date: Fri, 28 Jun 2019 13:40:51 -0700 Message-Id: <1561754451-3305-4-git-send-email-gvrose8192@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1561754451-3305-1-git-send-email-gvrose8192@gmail.com> References: <1561754451-3305-1-git-send-email-gvrose8192@gmail.com> X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_ENVFROM_END_DIGIT,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE autolearn=no version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH 3/3] compat: Clean up tunnel_id_to_key X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org 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 --- datapath/linux/compat/ip_gre.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/datapath/linux/compat/ip_gre.c b/datapath/linux/compat/ip_gre.c index 6766661..2015d59 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,