2013-05-08 19:45:52

by Josh Boyer

[permalink] [raw]
Subject: [PATCH] if_cablemodem.h: Add parenthesis around ioctl macros

Protect the SIOCGCM* ioctl macros with parenthesis.

Reported-by: Paul Wouters <[email protected]>
Signed-off-by: Josh Boyer <[email protected]>
---
include/uapi/linux/if_cablemodem.h | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/uapi/linux/if_cablemodem.h b/include/uapi/linux/if_cablemodem.h
index 9ca1007..ee6b3c4 100644
--- a/include/uapi/linux/if_cablemodem.h
+++ b/include/uapi/linux/if_cablemodem.h
@@ -12,11 +12,11 @@
*/

/* some useful defines for sb1000.c e cmconfig.c - fv */
-#define SIOCGCMSTATS SIOCDEVPRIVATE+0 /* get cable modem stats */
-#define SIOCGCMFIRMWARE SIOCDEVPRIVATE+1 /* get cm firmware version */
-#define SIOCGCMFREQUENCY SIOCDEVPRIVATE+2 /* get cable modem frequency */
-#define SIOCSCMFREQUENCY SIOCDEVPRIVATE+3 /* set cable modem frequency */
-#define SIOCGCMPIDS SIOCDEVPRIVATE+4 /* get cable modem PIDs */
-#define SIOCSCMPIDS SIOCDEVPRIVATE+5 /* set cable modem PIDs */
+#define SIOCGCMSTATS (SIOCDEVPRIVATE+0) /* get cable modem stats */
+#define SIOCGCMFIRMWARE (SIOCDEVPRIVATE+1) /* get cm firmware version */
+#define SIOCGCMFREQUENCY (SIOCDEVPRIVATE+2) /* get cable modem frequency */
+#define SIOCSCMFREQUENCY (SIOCDEVPRIVATE+3) /* set cable modem frequency */
+#define SIOCGCMPIDS (SIOCDEVPRIVATE+4) /* get cable modem PIDs */
+#define SIOCSCMPIDS (SIOCDEVPRIVATE+5) /* set cable modem PIDs */

#endif
--
1.8.1.4


2013-05-08 20:16:24

by David Miller

[permalink] [raw]
Subject: Re: [PATCH] if_cablemodem.h: Add parenthesis around ioctl macros

From: Josh Boyer <[email protected]>
Date: Wed, 8 May 2013 15:45:47 -0400

> Protect the SIOCGCM* ioctl macros with parenthesis.
>
> Reported-by: Paul Wouters <[email protected]>
> Signed-off-by: Josh Boyer <[email protected]>

Applied and queued up for -stable.