| Message ID | 1408710414-13810-1-git-send-email-linux@rasmusvillemoes.dk |
|---|---|
| State | Awaiting Upstream, archived |
| Delegated to: | David Miller |
| Headers | show |
Rasmus Villemoes <linux@rasmusvillemoes.dk> writes: > The files ray_cs.h and rayctl.h both contain two thirds of what > appears to be an include guard using the macro name RAYLINK_H (both > lack the #define). Since RAYLINK_H is not defined anywhere, the > guards using different macro names. > I need to stop using the # character in my commit messages, or at least check that git didn't eat any of my lines. This was supposed to be something like "... defined anywhere, the #ifndefs are simply confusing no-ops. Add proper include guards using different macro names". Rasmus -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Rasmus Villemoes <linux@rasmusvillemoes.dk> writes: > The files ray_cs.h and rayctl.h both contain two thirds of what > appears to be an include guard using the macro name RAYLINK_H (both > lack the #define). Since RAYLINK_H is not defined anywhere, the > guards using different macro names. > > Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> > --- > drivers/net/wireless/ray_cs.h | 5 +++-- > drivers/net/wireless/rayctl.h | 5 +++-- As this a change to ray_cs driver, please use prefix "ray_cs:" and drop that "drivers: net: wireless:".
diff --git a/drivers/net/wireless/ray_cs.h b/drivers/net/wireless/ray_cs.h index e79848f..524c2f0 100644 --- a/drivers/net/wireless/ray_cs.h +++ b/drivers/net/wireless/ray_cs.h @@ -3,7 +3,8 @@ Written by Corey Thomas */ -#ifndef RAYLINK_H +#ifndef _RAY_CS_H_ +#define _RAY_CS_H_ struct beacon_rx { struct mac_header mac; @@ -69,4 +70,4 @@ typedef struct ray_dev_t { } ray_dev_t; /*****************************************************************************/ -#endif /* RAYLINK_H */ +#endif /* _RAY_CS_H_ */ diff --git a/drivers/net/wireless/rayctl.h b/drivers/net/wireless/rayctl.h index 3c3b98b..b21ed64 100644 --- a/drivers/net/wireless/rayctl.h +++ b/drivers/net/wireless/rayctl.h @@ -1,4 +1,5 @@ -#ifndef RAYLINK_H +#ifndef _RAYCTL_H_ +#define _RAYCTL_H_ typedef unsigned char UCHAR; @@ -729,4 +730,4 @@ typedef struct snaphdr_t #define RAY_IPX_TYPE 0x8137 #define APPLEARP_TYPE 0x80f3 /*****************************************************************************/ -#endif /* #ifndef RAYLINK_H */ +#endif /* _RAYCTL_H_ */
The files ray_cs.h and rayctl.h both contain two thirds of what appears to be an include guard using the macro name RAYLINK_H (both lack the #define). Since RAYLINK_H is not defined anywhere, the guards using different macro names. Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> --- drivers/net/wireless/ray_cs.h | 5 +++-- drivers/net/wireless/rayctl.h | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-)