Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp2236815ybl; Sun, 19 Jan 2020 22:26:23 -0800 (PST) X-Google-Smtp-Source: APXvYqzNYOK4lOKHRV2gtk9JxcpJOd/R3vqxaFMLYaRpr2O/X0tlmSONtDCekMenU4zwdYedltX5 X-Received: by 2002:a05:6830:1d55:: with SMTP id p21mr14706727oth.145.1579501583515; Sun, 19 Jan 2020 22:26:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1579501583; cv=none; d=google.com; s=arc-20160816; b=yz6uLVub9G4cbF4MSsBEsXuTJcpIg8V8L5YLMppjFlK/91NFIgaWy4p+FAK9WaL1Iw PEgYQb8HdMN/4wmQ02U2vYPeLcLjtP9LsZYwq4tvktAK8mbg0kHqqbJoenhivIrQmp6k ZS0Hjeye5L6kYeJNz6l9O2ejGYQyVdqznVjFZNqvQbo/bxj+qQGw+aZjA3wSsQdhUPPi i1Z9iCvPnIKkhC5nT4SbgSEL7JgzSaI5qXSCAtInOXpMEN0qKulr0xSi7Ak6GN/Qp0kn Sip/gd9xSww2kOX0X6Gru5SxBl8Ky7AT+QAeUuY+yZda5sNNCmtzsOpbClJRp/vGdIOj skcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature; bh=d5Eadt8gafPSmu+6ZZhsajj1XzECvvpLFOHL6bzhCvE=; b=H37BNKsUx8C/bo4W3YoM18IuTCpLVQg5PzG02fmrNMnixt0CJs4kp26G19X1AiiC3x Juj40IiBlFJtYIx2VxrtH/sj7ZItL+LRLuoTdlJ7M0yPtdyJ6S9izqDam7CqpLykgWwx 7CsK3JGhOTrz1nhzQu12fwdI7mWME5D5Imt3RIkZrjweAgDpZGpwJJS0ZOFuVFhD/OZE TA5yLLHjZqlcQy9EbGMKrBK7/W37ug8KXckfH91FbTttjy+89iF4vsWYa+KXSb485c8A Vsmy5rxB8yOyzGEiO3pujlXlPa8aQc4kTSDAc//Ux4vsJQvyL4Zz5AdRxHej59Cp4pO4 DKCA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=pd4TtqZa; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n203si16604573oia.112.2020.01.19.22.26.11; Sun, 19 Jan 2020 22:26:23 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=pd4TtqZa; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726476AbgATGZR (ORCPT + 99 others); Mon, 20 Jan 2020 01:25:17 -0500 Received: from mail-pl1-f193.google.com ([209.85.214.193]:44569 "EHLO mail-pl1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725783AbgATGZQ (ORCPT ); Mon, 20 Jan 2020 01:25:16 -0500 Received: by mail-pl1-f193.google.com with SMTP id d9so972107plo.11; Sun, 19 Jan 2020 22:25:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=d5Eadt8gafPSmu+6ZZhsajj1XzECvvpLFOHL6bzhCvE=; b=pd4TtqZa/TDq8H3rhUA/D8jxwFSwuZExZvB8kkCdh5lhqZXXL2nRS0NhKqcPVbG7Jt Zw6lwxNQk0yz08JBh4GTRgxoj4kLhOxtr82oi2ySUU/kp0UbIraA820X9KHLL1KmlKDd T4rcLeRc82gc+JNjfMOLh6IsFtqVz1f2ihQOs5IrQsVclUyg+EO+9tuufaP7W5ZAJG4U nC3qJOnbrSy42PFPbYlEM2mKPEqggdorRt/Zjq648gy8bi8z+hAfJ9PNHwGfDiSGHFPO 61E1MX/zP/3WvDgF+rCw9GhAIQCAyJb10ws4WXQY6NIJri+elG2UxVHgTQToRxGL96To zytg== 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; bh=d5Eadt8gafPSmu+6ZZhsajj1XzECvvpLFOHL6bzhCvE=; b=i5/ltK6NxnmeHti9RXit+4fzlcFet6Z2ciBF5O4dF9yBhNHGqZ7AbX6r6Enz5pKqeZ bTYXPb1MRKmDQ/Bt0PJ3eM4iSnVwqNuEv84jrBmsp9P50eks9A6uGHff1joUOk5wcrwJ 4kZr6nLJaTEuXiJDa2soGtV4QfSjvYwWj9sk8n47tUDt1i0T7KcTJmsb1ItBBNJYS0as udnOar5i6UxmvijxjDIhg543xjgOZUjXhL7Sd1fDfdlr5zLCmaXPY6uVrsakPuM7APk4 SWVgfCdz/reCirJWzuXYIw/IrkjkGXsBjxauInhU5q1tTNx4vOzkEn684fF7c5NXaZJ/ 7xmQ== X-Gm-Message-State: APjAAAWtEFYECUFFz1vxXDALpdN+Fzk89WwmAOYqdLgKKSsZouQf7IRm oK5W+IG+HDtYeFXFwaMk7V4= X-Received: by 2002:a17:902:8a91:: with SMTP id p17mr12598108plo.75.1579501516231; Sun, 19 Jan 2020 22:25:16 -0800 (PST) Received: from ZB-PF11LQ25.360buyad.local ([103.90.76.242]) by smtp.gmail.com with ESMTPSA id hg11sm7758425pjb.14.2020.01.19.22.25.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Jan 2020 22:25:15 -0800 (PST) From: "xiaofeng.yan" To: davem@davemloft.net, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, ap420073@gmail.com Cc: xiaofeng.yan2012@gmail.com, yanxiaofeng7@jd.com Subject: [PATCH v2] hsr: Fix a compilation error Date: Mon, 20 Jan 2020 14:26:39 +0800 Message-Id: <20200120062639.3074-1-xiaofeng.yan2012@gmail.com> X-Mailer: git-send-email 2.17.1 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: "xiaofeng.yan" A compliation error happen when building branch 5.5-rc7 In file included from net/hsr/hsr_main.c:12:0: net/hsr/hsr_main.h:194:20: error: two or more data types in declaration specifiers static inline void void hsr_debugfs_rename(struct net_device *dev) So Removed one void. Fixes: 4c2d5e33dcd3 ("hsr: rename debugfs file when interface name is changed") Signed-off-by: xiaofeng.yan Acked-by: Taehee Yoo --- net/hsr/hsr_main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/hsr/hsr_main.h b/net/hsr/hsr_main.h index d40de84..754d84b 100644 --- a/net/hsr/hsr_main.h +++ b/net/hsr/hsr_main.h @@ -191,7 +191,7 @@ static inline u16 hsr_get_skb_sequence_nr(struct sk_buff *skb) void hsr_debugfs_create_root(void); void hsr_debugfs_remove_root(void); #else -static inline void void hsr_debugfs_rename(struct net_device *dev) +static inline void hsr_debugfs_rename(struct net_device *dev) { } static inline void hsr_debugfs_init(struct hsr_priv *priv, -- 1.8.3.1