From: Oliver Hartkopp <oliver@hartkopp.net>
To: David Miller <davem@davemloft.net>
Cc: Sam Ravnborg <sam@ravnborg.org>,
Urs Thuermann <urs@isnogud.escape.de>,
netdev@vger.kernel.org
Subject: [PATCH net-2.6.25] CAN: Fix plain integer definitions in userspace header & new CAN version 20071227
Date: Thu, 27 Dec 2007 21:14:57 +0100 [thread overview]
Message-ID: <477407C1.1050405@hartkopp.net> (raw)
[-- Attachment #1: Type: text/plain, Size: 449 bytes --]
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 <oliver@hartkopp.net>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
---
[-- Attachment #2: plain_int.patch --]
[-- Type: text/x-diff, Size: 1136 bytes --]
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"
next reply other threads:[~2007-12-27 20:16 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-12-27 20:14 Oliver Hartkopp [this message]
2007-12-28 0:49 ` [PATCH net-2.6.25] CAN: Fix plain integer definitions in userspace header & new CAN version 20071227 David Miller
2007-12-28 9:26 ` Oliver Hartkopp
2007-12-28 10:10 ` Oliver Hartkopp
2007-12-28 0:50 ` David Miller
2007-12-28 8:58 ` Oliver Hartkopp
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=477407C1.1050405@hartkopp.net \
--to=oliver@hartkopp.net \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=sam@ravnborg.org \
--cc=urs@isnogud.escape.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).