History

Merge branch 'for-davem' of git://gitorious.org/linux-can/linux-can-next

Marc Kleine-Budde says: ==================== this is a pull request for net-next. There are two patches from Gerhard Sittig, which improves the clock handling on mpc5121. Oliver Hartkopp provides a patch that adds a per rule limitation of frame hops. ====================

David S. Miller committed 13 years ago

Commit c12a2242 parents e7abfe4 391ac125 files · +82 −13Browse files

Showing the changes to include/uapi/linux (1 of 5 files). Show all

Unified · Split

include/uapi/linux/can/gw.h+8−1
@@ -45,6 +45,7 @@ enum { · 44 unmodified lines
45 CGW_DST_IF, /* ifindex of destination network interface */45 CGW_DST_IF, /* ifindex of destination network interface */
46 CGW_FILTER, /* specify struct can_filter on source CAN device */46 CGW_FILTER, /* specify struct can_filter on source CAN device */
47 CGW_DELETED, /* number of deleted CAN frames (see max_hops param) */47 CGW_DELETED, /* number of deleted CAN frames (see max_hops param) */
48 CGW_LIM_HOPS, /* limit the number of hops of this specific rule */
48 __CGW_MAX49 __CGW_MAX
49};50};
50 51
@@ -116,13 +117,19 @@ enum { · 65 unmodified lines
116 * Sets a CAN receive filter for the gateway job specified by the117 * Sets a CAN receive filter for the gateway job specified by the
117 * struct can_filter described in include/linux/can.h118 * struct can_filter described in include/linux/can.h
118 *119 *
119 * CGW_MOD_XXX (length 17 bytes):120 * CGW_MOD_(AND|OR|XOR|SET) (length 17 bytes):
120 * Specifies a modification that's done to a received CAN frame before it is121 * Specifies a modification that's done to a received CAN frame before it is
121 * send out to the destination interface.122 * send out to the destination interface.
122 *123 *
123 * <struct can_frame> data used as operator124 * <struct can_frame> data used as operator
124 * <u8> affected CAN frame elements125 * <u8> affected CAN frame elements
125 *126 *
127 * CGW_LIM_HOPS (length 1 byte):
128 * Limit the number of hops of this specific rule. Usually the received CAN
129 * frame can be processed as much as 'max_hops' times (which is given at module
130 * load time of the can-gw module). This value is used to reduce the number of
131 * possible hops for this gateway rule to a value smaller then max_hops.
132 *
126 * CGW_CS_XOR (length 4 bytes):133 * CGW_CS_XOR (length 4 bytes):
127 * Set a simple XOR checksum starting with an initial value into134 * Set a simple XOR checksum starting with an initial value into
128 * data[result-idx] using data[start-idx] .. data[end-idx]135 * data[result-idx] using data[start-idx] .. data[end-idx]