Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp2113484ybl; Sun, 19 Jan 2020 19:26:27 -0800 (PST) X-Google-Smtp-Source: APXvYqwbw6LIfLJh6ZGc9B6U5WjbuT4inTp0nroV5cQ+6QnqY7zhIsykXy8xKwn+8FZ3lgXTZITO X-Received: by 2002:a05:6808:9ba:: with SMTP id e26mr11636973oig.81.1579490786987; Sun, 19 Jan 2020 19:26:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1579490786; cv=none; d=google.com; s=arc-20160816; b=hhCyIWZmrL+wWNOnBPCPpfZLVuuQvvLQbWdBtvMRIrF+ccE0lop9gGeYwoq9fl+meR ho5JzfsoMPGe2MEFzfQcI+H7OPNVh6rEsuEask/N2GIJkSTVDe01eCUyVEnquPOivkQf F/h6dWRPxLeL2XJGiPqG/lFg6CtyYpiN2ZkiT/iIbus1Eipysvbi9Nd6taO59xPWFOKh Vy00VBxXLTFG3Xv7AaAL2b2Z23EW5V0y5s59Eui5i69k3ECrLUX58GZvwQh0cfOZoT/i 1yGqIp21TVzta3DLE/M0mDT1B/tBq+RI7L+N7nKj0ouyhRFzy3DnxM+9DBHBTewgUSc+ 8bxw== 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=gGTltzfrdckJmMP0SmbR/3670dsenUvBc1hdDm8j+Co=; b=wpUo45M9ZzZvBl7qIlJ/BdhsXVD2+1+oZIg4LulXxKvyoMbU00/Lh6mHwckOaxS2xG 3zsjn8YStx/uBugzo0gNKOuGa7YpBTij9txr9/Dz580KvdVyQQAY6L6SYIAfnSNyLpfx SkJM7mKZ1KIp964BFYqjh8NFWY0u/LV/awwwHhSCfA+m7TVDSg4FwbdyltFggBoQVXbP E2Oyri1fesncVyxM6H1puCi921p7YXVpwaaouBE9Xahf81ToHydjCqb3Nsh6fSrPYpKR 7Mfib2AAYLOcHKiYI4hFz2NKw5TIKzw4k2cDSSWrOv6sTSMtAEfDkMdo/hmzu7BbemLe RPLA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=PlzVDVIV; 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 i12si17384148oik.171.2020.01.19.19.26.15; Sun, 19 Jan 2020 19:26:26 -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=PlzVDVIV; 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 S1729064AbgATDZX (ORCPT + 99 others); Sun, 19 Jan 2020 22:25:23 -0500 Received: from mail-pl1-f196.google.com ([209.85.214.196]:47081 "EHLO mail-pl1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728949AbgATDZW (ORCPT ); Sun, 19 Jan 2020 22:25:22 -0500 Received: by mail-pl1-f196.google.com with SMTP id y8so12541191pll.13; Sun, 19 Jan 2020 19:25:22 -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=gGTltzfrdckJmMP0SmbR/3670dsenUvBc1hdDm8j+Co=; b=PlzVDVIVTYL+JvwV8Jivonm8IKSry0nGRLpyb41XKV64sw14IXqFXP0KBNUvAUasmh sH6hrK+/CndaAbTha23UoL6t4mg94f3dyLgm1wYq5MnfbNPt5RVhOd+DHoF/2FQ6uYd2 PIL5rCiztacJ2sxELOkNZmdaIxcgrwxrIieV53Mmpn7MzoRZ96uJUBxITxWew+TpJ8Jv nF9EbTRrzV3phT6GGptkpVktkihXTGRcC92Vw5J/W6a76cv5AVmsKAxxs781FvyRsh7W /Oyqo+v4tu6se3dWBBK4DeLH1OdRB/Y9+X6SbHaj48PfIn5oL7umCuweerN3mXbK9juH dGHQ== 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=gGTltzfrdckJmMP0SmbR/3670dsenUvBc1hdDm8j+Co=; b=UPneMEwa+X8cIyYf6ODjS+PWyVaBjCvZadDg+HUYEefQk2Yvzlr4myLWd/M4QLVEmR 8xtM4eS1qsKZ+BeaEMrYiK8sPGSLZUZQoI1NPPm2JzmdfKe1M3mIF4XH88KIOJikjjav V0cjng2yz4ULrTV6EvQnzturkcC/JI82B4/2duQ4rT0Kg2MmwU8jvHTl61sQsw0ZF0ij 9kXLk6tH1AytHjU1XW8RIm3NdGCi7YUScHpLdd/fkoL/v+mFIiQFB+2WdwXcYdMHq+b9 9eOi+jGRI13Rfn9QIJ9YWWQRVvZxJyonF5n/uz0Epjg+F7gQenMPpTL+NNC/xgmJM33G UZfw== X-Gm-Message-State: APjAAAWG9frmB3cmqkjZgjtIB1C2HC09z/nPHpLDweshksyi/AU/mkkD it5QXqFTJ8kwLk6mTzh2ID0= X-Received: by 2002:a17:902:bd96:: with SMTP id q22mr12244457pls.318.1579490722243; Sun, 19 Jan 2020 19:25:22 -0800 (PST) Received: from ZB-PF11LQ25.360buyad.local ([103.90.76.242]) by smtp.gmail.com with ESMTPSA id k44sm491901pjb.20.2020.01.19.19.25.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Jan 2020 19:25:21 -0800 (PST) From: "xiaofeng.yan" To: arvid.brodin@alten.se, davem@davemloft.net, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: xiaofeng.yan2012@gmail.com, yanxiaofeng7@jd.com Subject: [PATCH] hsr: Fix a compilation error Date: Mon, 20 Jan 2020 11:26:39 +0800 Message-Id: <20200120032639.2963-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. Signed-off-by: xiaofeng.yan --- 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