From patchwork Tue Aug 7 21:48:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Rose X-Patchwork-Id: 954693 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="HmONZXRj"; 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 41lSpR60P2z9s4V for ; Wed, 8 Aug 2018 07:49:19 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id BE824E82; Tue, 7 Aug 2018 21:49: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 E6D75D1D for ; Tue, 7 Aug 2018 21:48:59 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pf1-f196.google.com (mail-pf1-f196.google.com [209.85.210.196]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 9F0631FB for ; Tue, 7 Aug 2018 21:48:59 +0000 (UTC) Received: by mail-pf1-f196.google.com with SMTP id l9-v6so63373pff.9 for ; Tue, 07 Aug 2018 14:48: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=YFlCDwlWB3HNiNMv6arkOf9KNLh35WiTCRwzqftpR3I=; b=HmONZXRj4o+ADlwCeczqPINi8kTC7F7diC//NKmvr8xwxLzkvfu2E19AcBtWV/Ac1A vvyDvpPvTLWIQzcl6VM+0QHwB7pE4EkYTfMETWqW/ZLwjQJD2XQvM9Tu1KkJM9IfYtOT uKTr0i7XwGmE7u8xmt1x81liInvUzht+f06q0/Scb4NSsdt3ru3bCnCp7BFAeld4jVpg r4R+yaB+MRIPTuqgLicPr/wm7zUrd8mbxwfqSIBW5jUBlu3i8lNEah3eOZd91D/qZ4wQ St79CHNKBz+TWNib4HPNvErVzBTisBV35YbRKPywX/ux1XGCXFkTqTuE8a7WVTh/KVhI x3pw== 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=YFlCDwlWB3HNiNMv6arkOf9KNLh35WiTCRwzqftpR3I=; b=t7otalHn2NBPSm77v2dL2GZmR7Kg7EPWQHnpWILIQnRaGoiXubyhdTDvdJQLCTYYBB JrNV9SkVq/aRZVY97kIYG/qCaONf7Sl1S50tSxViXDUpxkn6DQSvRGQexd3gOxw17RrV C+OFn9kHykcXcrXtXd9E4KUrHt3hoIXgcAsqhnLUXkTtVRrWNssSqq8XEnNAC8tYk0A9 YEeX5z2yjFaOyZILPhKLyBalD5GEpMf7w54TJRj0Dv21300Lj6b1cEaad5Jr78hyl91W /soafzhpkwPlXOn3yF4DUbmqd58qcoAIgBAt8q/VsVEeipwD+KVnkB5ERRJucrzg2tqs 5DRQ== X-Gm-Message-State: AOUpUlGpj04qfrZaIzaoH+Gn1lVkuhJMfX6emO4C51KDtXnCagmTznuh M2xLZcPN0NC8feZ3hfTQUwVXdCbd X-Google-Smtp-Source: AA+uWPwjc0kb0Ka+p6vGuICE/xgljK7v7kYti2eCoD02V4ZE4Ic9B2dUdEJxBEQvRhiHJ/+tIf6Bfg== X-Received: by 2002:a62:89d8:: with SMTP id n85-v6mr140976pfk.83.1533678538899; Tue, 07 Aug 2018 14:48:58 -0700 (PDT) Received: from gizo.domain ([97.115.152.114]) by smtp.gmail.com with ESMTPSA id l71-v6sm3263020pgd.70.2018.08.07.14.48.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 Aug 2018 14:48:57 -0700 (PDT) From: Greg Rose To: dev@openvswitch.org Date: Tue, 7 Aug 2018 14:48:53 -0700 Message-Id: <1533678533-18145-2-git-send-email-gvrose8192@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1533678533-18145-1-git-send-email-gvrose8192@gmail.com> References: <1533678533-18145-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 Cc: YueHaibing Subject: [ovs-dev] [PATCH 2/2] ip_gre: remove redundant variables t_hlen 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 From: YueHaibing Upstream commit: From: YueHaibing Date: Wed, 1 Aug 2018 10:04:02 +0800 Subject: [PATCH] ip_gre: remove redundant variables t_hlen After commit ffc2b6ee4174 ("ip_gre: fix IFLA_MTU ignored on NEWLINK") variable t_hlen is assigned values that are never read, hence they are redundant and can be removed. Signed-off-by: YueHaibing Signed-off-by: David S. Miller Cc: YueHaibing Signed-off-by: Greg Rose --- datapath/linux/compat/ip_gre.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/datapath/linux/compat/ip_gre.c b/datapath/linux/compat/ip_gre.c index 47ee525..47ed5e0 100644 --- a/datapath/linux/compat/ip_gre.c +++ b/datapath/linux/compat/ip_gre.c @@ -681,7 +681,6 @@ err_free_skb: static void __gre_tunnel_init(struct net_device *dev) { struct ip_tunnel *tunnel; - int t_hlen; tunnel = netdev_priv(dev); tunnel->tun_hlen = ip_gre_calc_hlen(tunnel->parms.o_flags); @@ -689,8 +688,6 @@ static void __gre_tunnel_init(struct net_device *dev) tunnel->hlen = tunnel->tun_hlen + tunnel->encap_hlen; - t_hlen = tunnel->hlen + sizeof(struct iphdr); - dev->features |= GRE_FEATURES; dev->hw_features |= GRE_FEATURES; @@ -1031,13 +1028,11 @@ EXPORT_SYMBOL_GPL(ovs_gre_fill_metadata_dst); static int erspan_tunnel_init(struct net_device *dev) { struct ip_tunnel *tunnel = netdev_priv(dev); - int t_hlen; tunnel->tun_hlen = 8; tunnel->parms.iph.protocol = IPPROTO_GRE; tunnel->hlen = tunnel->tun_hlen + tunnel->encap_hlen + erspan_hdr_len(tunnel->erspan_ver); - t_hlen = tunnel->hlen + sizeof(struct iphdr); dev->features |= GRE_FEATURES; dev->hw_features |= GRE_FEATURES;