From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CC1E2C433E0 for ; Tue, 2 Mar 2021 09:21:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8B43560202 for ; Tue, 2 Mar 2021 09:21:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1378845AbhCBJCu (ORCPT ); Tue, 2 Mar 2021 04:02:50 -0500 Received: from mga09.intel.com ([134.134.136.24]:12269 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1443720AbhCBIcv (ORCPT ); Tue, 2 Mar 2021 03:32:51 -0500 IronPort-SDR: d+otvZh0Q61JEQaTR2dMskmBdekhOwW1heyzABFBnbNqQ4PbxkcCuYltGBXYDrcyyomv9Qw5aF /oKSZUj3j/XQ== X-IronPort-AV: E=McAfee;i="6000,8403,9910"; a="186854241" X-IronPort-AV: E=Sophos;i="5.81,216,1610438400"; d="scan'208";a="186854241" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Mar 2021 00:29:27 -0800 IronPort-SDR: Lr9ZQY2imtSsrdnrHYfn3ON+IEPyfn3Xuay6C4vkPqhG4EfsRM213coS9nnyJaNTTpqfDOhiOz xCnZma5n568w== X-IronPort-AV: E=Sophos;i="5.81,216,1610438400"; d="scan'208";a="406614259" Received: from sneftin-mobl.ger.corp.intel.com (HELO [10.251.185.3]) ([10.251.185.3]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Mar 2021 00:29:25 -0800 Subject: Re: [Intel-wired-lan] [PATCH net 1/2] e1000e: Fix duplicate include guard To: Tom Seewald , netdev@vger.kernel.org Cc: Auke Kok , Jeff Garzik , Jakub Kicinski , intel-wired-lan@lists.osuosl.org, "David S. Miller" , gregkh@linuxfoundation.org References: <20210222040005.20126-1-tseewald@gmail.com> From: "Neftin, Sasha" Message-ID: <4b289f9c-b7ca-c48e-de4b-b83b6b540da3@intel.com> Date: Tue, 2 Mar 2021 10:29:23 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.7.1 MIME-Version: 1.0 In-Reply-To: <20210222040005.20126-1-tseewald@gmail.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On 2/22/2021 06:00, Tom Seewald wrote: > The include guard "_E1000_HW_H_" is used by header files in three > different drivers (e1000/e1000_hw.h, e1000e/hw.h, and igb/e1000_hw.h). > Using the same include guard macro in more than one header file may > cause unexpected behavior from the compiler. Fix the duplicate include > guard in the e1000e driver by renaming it. > > Fixes: bc7f75fa9788 ("[E1000E]: New pci-express e1000 driver (currently for ICH9 devices only)") > Signed-off-by: Tom Seewald > --- > drivers/net/ethernet/intel/e1000e/hw.h | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/net/ethernet/intel/e1000e/hw.h b/drivers/net/ethernet/intel/e1000e/hw.h > index 69a2329ea463..db79c4e6413e 100644 > --- a/drivers/net/ethernet/intel/e1000e/hw.h > +++ b/drivers/net/ethernet/intel/e1000e/hw.h > @@ -1,8 +1,8 @@ > /* SPDX-License-Identifier: GPL-2.0 */ > /* Copyright(c) 1999 - 2018 Intel Corporation. */ > > -#ifndef _E1000_HW_H_ > -#define _E1000_HW_H_ > +#ifndef _E1000E_HW_H_ > +#define _E1000E_HW_H_ > > #include "regs.h" > #include "defines.h" > @@ -714,4 +714,4 @@ struct e1000_hw { > #include "80003es2lan.h" > #include "ich8lan.h" > > -#endif > +#endif /* _E1000E_HW_H_ */ > Acked-by: Sasha Neftin