This patch fixes the use of plain integers instead of __u32 in a struct
that is visible from kernel space and user space. As this change is user
visible this patch also updates the CAN version to 20071227.
Thanks to Sam Ravnborg for pointing out the wrong plain int usage.
It applies on the current net-2.6.25 tree.
Tnx & best regards,
Oliver
Signed-off-by: Oliver Hartkopp <[EMAIL PROTECTED]>
Acked-by: Sam Ravnborg <[EMAIL PROTECTED]>
---
diff -uprN -X net-2.6.25/Documentation/dontdiff net-2.6.25/include/linux/can/bcm.h export/net2625-2007-12-27/include/linux/can/bcm.h
--- net-2.6.25/include/linux/can/bcm.h 2007-12-15 19:33:20.000000000 +0100
+++ export/net2625-2007-12-27/include/linux/can/bcm.h 2007-12-27 20:35:54.000000000 +0100
@@ -26,12 +26,12 @@
* @frames: array of CAN frames.
*/
struct bcm_msg_head {
- int opcode;
- int flags;
- int count;
+ __u32 opcode;
+ __u32 flags;
+ __u32 count;
struct timeval ival1, ival2;
canid_t can_id;
- int nframes;
+ __u32 nframes;
struct can_frame frames[0];
};
diff -uprN -X net-2.6.25/Documentation/dontdiff net-2.6.25/include/linux/can/core.h export/net2625-2007-12-27/include/linux/can/core.h
--- net-2.6.25/include/linux/can/core.h 2007-12-15 19:33:20.000000000 +0100
+++ export/net2625-2007-12-27/include/linux/can/core.h 2007-12-27 20:35:54.000000000 +0100
@@ -19,7 +19,7 @@
#include <linux/skbuff.h>
#include <linux/netdevice.h>
-#define CAN_VERSION "20071116"
+#define CAN_VERSION "20071227"
/* increment this number each time you change some user-space interface */
#define CAN_ABI_VERSION "8"
