* [PATCH] drivers: net: wireless: Add include guards
@ 2014-08-22 12:26 Rasmus Villemoes
2014-08-22 13:32 ` Rasmus Villemoes
2014-08-24 12:01 ` Kalle Valo
0 siblings, 2 replies; 4+ messages in thread
From: Rasmus Villemoes @ 2014-08-22 12:26 UTC (permalink / raw)
To: John W. Linville; +Cc: linux-wireless, netdev, linux-kernel, Rasmus Villemoes
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(-)
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_ */
--
1.9.2
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] drivers: net: wireless: Add include guards
2014-08-22 12:26 [PATCH] drivers: net: wireless: Add include guards Rasmus Villemoes
@ 2014-08-22 13:32 ` Rasmus Villemoes
2014-08-24 12:01 ` Kalle Valo
1 sibling, 0 replies; 4+ messages in thread
From: Rasmus Villemoes @ 2014-08-22 13:32 UTC (permalink / raw)
To: John W. Linville; +Cc: linux-wireless, netdev, linux-kernel
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] drivers: net: wireless: Add include guards
2014-08-22 12:26 [PATCH] drivers: net: wireless: Add include guards Rasmus Villemoes
2014-08-22 13:32 ` Rasmus Villemoes
@ 2014-08-24 12:01 ` Kalle Valo
2014-08-25 7:59 ` [PATCH v2] ray_cs: " Rasmus Villemoes
1 sibling, 1 reply; 4+ messages in thread
From: Kalle Valo @ 2014-08-24 12:01 UTC (permalink / raw)
To: Rasmus Villemoes; +Cc: John W. Linville, linux-wireless, netdev, linux-kernel
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:".
--
Kalle Valo
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v2] ray_cs: Add include guards
2014-08-24 12:01 ` Kalle Valo
@ 2014-08-25 7:59 ` Rasmus Villemoes
0 siblings, 0 replies; 4+ messages in thread
From: Rasmus Villemoes @ 2014-08-25 7:59 UTC (permalink / raw)
To: John W. Linville, Kalle Valo
Cc: linux-wireless, netdev, linux-kernel, Rasmus Villemoes
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
#ifndefs are confusing no-ops. Add proper include guards using
different macro names.
Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
---
Notes:
v2: Change subject prefix and fix broken commit message.
drivers/net/wireless/ray_cs.h | 5 +++--
drivers/net/wireless/rayctl.h | 5 +++--
2 files changed, 6 insertions(+), 4 deletions(-)
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_ */
--
2.0.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-08-25 7:59 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-08-22 12:26 [PATCH] drivers: net: wireless: Add include guards Rasmus Villemoes
2014-08-22 13:32 ` Rasmus Villemoes
2014-08-24 12:01 ` Kalle Valo
2014-08-25 7:59 ` [PATCH v2] ray_cs: " Rasmus Villemoes
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).