| Message ID | 20210222040005.20126-1-tseewald@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [net,1/2] e1000e: Fix duplicate include guard | expand |
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>
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>
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>
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_ */
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(-)