summaryrefslogtreecommitdiffstats
path: root/kernel/include/uapi/linux/can
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/include/uapi/linux/can')
-rw-r--r--kernel/include/uapi/linux/can/bcm.h7
-rw-r--r--kernel/include/uapi/linux/can/gw.h5
2 files changed, 11 insertions, 1 deletions
diff --git a/kernel/include/uapi/linux/can/bcm.h b/kernel/include/uapi/linux/can/bcm.h
index 89ddb9dc9..7a291dc1f 100644
--- a/kernel/include/uapi/linux/can/bcm.h
+++ b/kernel/include/uapi/linux/can/bcm.h
@@ -47,6 +47,11 @@
#include <linux/types.h>
#include <linux/can.h>
+struct bcm_timeval {
+ long tv_sec;
+ long tv_usec;
+};
+
/**
* struct bcm_msg_head - head of messages to/from the broadcast manager
* @opcode: opcode, see enum below.
@@ -62,7 +67,7 @@ struct bcm_msg_head {
__u32 opcode;
__u32 flags;
__u32 count;
- struct timeval ival1, ival2;
+ struct bcm_timeval ival1, ival2;
canid_t can_id;
__u32 nframes;
struct can_frame frames[0];
diff --git a/kernel/include/uapi/linux/can/gw.h b/kernel/include/uapi/linux/can/gw.h
index 3e6184cf2..5079b9d57 100644
--- a/kernel/include/uapi/linux/can/gw.h
+++ b/kernel/include/uapi/linux/can/gw.h
@@ -78,6 +78,7 @@ enum {
CGW_FILTER, /* specify struct can_filter on source CAN device */
CGW_DELETED, /* number of deleted CAN frames (see max_hops param) */
CGW_LIM_HOPS, /* limit the number of hops of this specific rule */
+ CGW_MOD_UID, /* user defined identifier for modification updates */
__CGW_MAX
};
@@ -162,6 +163,10 @@ enum {
* load time of the can-gw module). This value is used to reduce the number of
* possible hops for this gateway rule to a value smaller then max_hops.
*
+ * CGW_MOD_UID (length 4 bytes):
+ * Optional non-zero user defined routing job identifier to alter existing
+ * modification settings at runtime.
+ *
* CGW_CS_XOR (length 4 bytes):
* Set a simple XOR checksum starting with an initial value into
* data[result-idx] using data[start-idx] .. data[end-idx]