* [Intel-wired-lan] [PATCH net 1/2] e1000e: Fix duplicate include guard
@ 2021-02-22 4:00 ` Tom Seewald
0 siblings, 0 replies; 10+ messages in thread
From: Tom Seewald @ 2021-02-22 4:00 UTC (permalink / raw)
To: intel-wired-lan
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>
---
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_ */
--
2.20.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH net 2/2] igb: Fix duplicate include guard
2021-02-22 4:00 ` [Intel-wired-lan] " Tom Seewald
@ 2021-02-22 4:00 ` Tom Seewald
-1 siblings, 0 replies; 10+ messages in thread
From: Tom Seewald @ 2021-02-22 4:00 UTC (permalink / raw)
To: netdev
Cc: tseewald, intel-wired-lan, Jesse Brandeburg, Tony Nguyen,
David S. Miller, Jakub Kicinski, Jeff Garzik, Auke Kok
The include guard "_E1000_HW_H_" is used by two separate header files in
two different drivers (e1000/e1000_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 this by renaming the
duplicate guard in the igb driver.
Fixes: 9d5c824399de ("igb: PCI-Express 82575 Gigabit Ethernet driver")
Signed-off-by: Tom Seewald <tseewald@gmail.com>
---
drivers/net/ethernet/intel/igb/e1000_hw.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/intel/igb/e1000_hw.h b/drivers/net/ethernet/intel/igb/e1000_hw.h
index 5d87957b2627..44111f65afc7 100644
--- a/drivers/net/ethernet/intel/igb/e1000_hw.h
+++ b/drivers/net/ethernet/intel/igb/e1000_hw.h
@@ -1,8 +1,8 @@
/* SPDX-License-Identifier: GPL-2.0 */
/* Copyright(c) 2007 - 2018 Intel Corporation. */
-#ifndef _E1000_HW_H_
-#define _E1000_HW_H_
+#ifndef _E1000_IGB_HW_H_
+#define _E1000_IGB_HW_H_
#include <linux/types.h>
#include <linux/delay.h>
@@ -551,4 +551,4 @@ s32 igb_write_pcie_cap_reg(struct e1000_hw *hw, u32 reg, u16 *value);
void igb_read_pci_cfg(struct e1000_hw *hw, u32 reg, u16 *value);
void igb_write_pci_cfg(struct e1000_hw *hw, u32 reg, u16 *value);
-#endif /* _E1000_HW_H_ */
+#endif /* _E1000_IGB_HW_H_ */
--
2.20.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [Intel-wired-lan] [PATCH net 2/2] igb: Fix duplicate include guard
@ 2021-02-22 4:00 ` Tom Seewald
0 siblings, 0 replies; 10+ messages in thread
From: Tom Seewald @ 2021-02-22 4:00 UTC (permalink / raw)
To: intel-wired-lan
The include guard "_E1000_HW_H_" is used by two separate header files in
two different drivers (e1000/e1000_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 this by renaming the
duplicate guard in the igb driver.
Fixes: 9d5c824399de ("igb: PCI-Express 82575 Gigabit Ethernet driver")
Signed-off-by: Tom Seewald <tseewald@gmail.com>
---
drivers/net/ethernet/intel/igb/e1000_hw.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/intel/igb/e1000_hw.h b/drivers/net/ethernet/intel/igb/e1000_hw.h
index 5d87957b2627..44111f65afc7 100644
--- a/drivers/net/ethernet/intel/igb/e1000_hw.h
+++ b/drivers/net/ethernet/intel/igb/e1000_hw.h
@@ -1,8 +1,8 @@
/* SPDX-License-Identifier: GPL-2.0 */
/* Copyright(c) 2007 - 2018 Intel Corporation. */
-#ifndef _E1000_HW_H_
-#define _E1000_HW_H_
+#ifndef _E1000_IGB_HW_H_
+#define _E1000_IGB_HW_H_
#include <linux/types.h>
#include <linux/delay.h>
@@ -551,4 +551,4 @@ s32 igb_write_pcie_cap_reg(struct e1000_hw *hw, u32 reg, u16 *value);
void igb_read_pci_cfg(struct e1000_hw *hw, u32 reg, u16 *value);
void igb_write_pci_cfg(struct e1000_hw *hw, u32 reg, u16 *value);
-#endif /* _E1000_HW_H_ */
+#endif /* _E1000_IGB_HW_H_ */
--
2.20.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH net 2/2] igb: Fix duplicate include guard
2021-02-22 4:00 ` [Intel-wired-lan] " Tom Seewald
@ 2021-02-26 22:30 ` Jesse Brandeburg
-1 siblings, 0 replies; 10+ messages in thread
From: Jesse Brandeburg @ 2021-02-26 22:30 UTC (permalink / raw)
To: Tom Seewald
Cc: netdev, intel-wired-lan, Tony Nguyen, David S. Miller,
Jakub Kicinski, Jeff Garzik, Auke Kok
Tom Seewald wrote:
> The include guard "_E1000_HW_H_" is used by two separate header files in
> two different drivers (e1000/e1000_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 this by renaming the
> duplicate guard in the igb driver.
>
> Fixes: 9d5c824399de ("igb: PCI-Express 82575 Gigabit Ethernet driver")
> Signed-off-by: Tom Seewald <tseewald@gmail.com>
Change is simple and makes sense.
Reviewed-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
^ permalink raw reply [flat|nested] 10+ messages in thread* [Intel-wired-lan] [PATCH net 2/2] igb: Fix duplicate include guard
@ 2021-02-26 22:30 ` Jesse Brandeburg
0 siblings, 0 replies; 10+ messages in thread
From: Jesse Brandeburg @ 2021-02-26 22:30 UTC (permalink / raw)
To: intel-wired-lan
Tom Seewald wrote:
> The include guard "_E1000_HW_H_" is used by two separate header files in
> two different drivers (e1000/e1000_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 this by renaming the
> duplicate guard in the igb driver.
>
> Fixes: 9d5c824399de ("igb: PCI-Express 82575 Gigabit Ethernet driver")
> Signed-off-by: Tom Seewald <tseewald@gmail.com>
Change is simple and makes sense.
Reviewed-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Intel-wired-lan] [PATCH net 1/2] e1000e: Fix duplicate include guard
2021-02-22 4:00 ` [Intel-wired-lan] " Tom Seewald
@ 2021-03-02 7:55 ` Dvora Fuxbrumer
-1 siblings, 0 replies; 10+ messages in thread
From: Dvora Fuxbrumer @ 2021-03-02 7:55 UTC (permalink / raw)
To: Tom Seewald, netdev
Cc: Auke Kok, Jeff Garzik, Jakub Kicinski, intel-wired-lan, David S. Miller
On 22/02/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 <tseewald@gmail.com>
> ---
> 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_ */
>
Tested-by: Dvora Fuxbrumer <dvorax.fuxbrumer@linux.intel.com>
^ permalink raw reply [flat|nested] 10+ messages in thread* [Intel-wired-lan] [PATCH net 1/2] e1000e: Fix duplicate include guard
@ 2021-03-02 7:55 ` Dvora Fuxbrumer
0 siblings, 0 replies; 10+ messages in thread
From: Dvora Fuxbrumer @ 2021-03-02 7:55 UTC (permalink / raw)
To: intel-wired-lan
On 22/02/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 <tseewald@gmail.com>
> ---
> 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_ */
>
Tested-by: Dvora Fuxbrumer <dvorax.fuxbrumer@linux.intel.com>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Intel-wired-lan] [PATCH net 1/2] e1000e: Fix duplicate include guard
2021-02-22 4:00 ` [Intel-wired-lan] " Tom Seewald
@ 2021-03-02 8:29 ` Neftin, Sasha
-1 siblings, 0 replies; 10+ messages in thread
From: Neftin, Sasha @ 2021-03-02 8:29 UTC (permalink / raw)
To: Tom Seewald, netdev
Cc: Auke Kok, Jeff Garzik, Jakub Kicinski, intel-wired-lan,
David S. Miller, gregkh
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 <tseewald@gmail.com>
> ---
> 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 <sasha.neftin@intel.com>
^ permalink raw reply [flat|nested] 10+ messages in thread* [Intel-wired-lan] [PATCH net 1/2] e1000e: Fix duplicate include guard
@ 2021-03-02 8:29 ` Neftin, Sasha
0 siblings, 0 replies; 10+ messages in thread
From: Neftin, Sasha @ 2021-03-02 8:29 UTC (permalink / raw)
To: intel-wired-lan
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 <tseewald@gmail.com>
> ---
> 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 <sasha.neftin@intel.com>
^ permalink raw reply [flat|nested] 10+ messages in thread