From: Tom Seewald <tseewald@gmail.com>

Date: Sun, 21 Feb 2021 22:00:04 -0600

Subject: e1000e: Fix duplicate include guard

Patch-mainline: v5.12-rc5

Git-commit: 896ea5dab25ef12f7d0988b8f0b053a287faf889

References: git-fixes

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 <tseewald@gmail.com>

Tested-by: Dvora Fuxbrumer <dvorax.fuxbrumer@linux.intel.com>

Acked-by: Sasha Neftin <sasha.neftin@intel.com>

Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>

Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>

---

 drivers/net/ethernet/intel/e1000e/hw.h |    6 +++---

 1 file changed, 3 insertions(+), 3 deletions(-)

--- 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"

@@ -703,4 +703,4 @@ struct e1000_hw {

 #include "80003es2lan.h"

 #include "ich8lan.h"

-#endif

+#endif /* _E1000E_HW_H_ */