iplink_can: support len8_dlc for Classical CAN
PATCH 1/1 iplink_can: support len8_dlc for Classical CAN
In a final version the include file update gets upstreamed separately.
Signed-off-by Oliver Hartkopp <[email protected]>
--- include/uapi/linux/can/netlink.h | 1 + ip/iplink_can.c | 6 ++++++ 2 files changed, 7 insertions(+)
include/uapi/linux/can/netlink.h +1 -0
@@ -98,10 +98,11 @@ struct can_ctrlmode {#define CAN_CTRLMODE_ONE_SHOT 0x08/* One-Shot mode */ #define CAN_CTRLMODE_BERR_REPORTING 0x10/* Bus-error reporting */ #define CAN_CTRLMODE_FD 0x20/* CAN FD mode */ #define CAN_CTRLMODE_PRESUME_ACK 0x40/* Ignore missing CAN ACKs */ #define CAN_CTRLMODE_FD_NON_ISO 0x80/* CAN FD in non-ISO mode */ +#define CAN_CTRLMODE_CC_LEN8_DLC 0x100/* Classic CAN DLC option */ /* * CAN device statistics */ struct can_device_stats {
ip/iplink_can.c +6 -0
@@ -35,10 +35,11 @@ static void print_usage(FILE *f)"\t[ one-shot { on | off } ]\n" "\t[ berr-reporting { on | off } ]\n" "\t[ fd { on | off } ]\n" "\t[ fd-non-iso { on | off } ]\n" "\t[ presume-ack { on | off } ]\n" +"\t[ cc-len8-dlc { on | off } ]\n" "\n" "\t[ restart-ms TIME-MS ]\n" "\t[ restart ]\n" "\n" "\t[ termination { 0..65535 } ]\n"
@@ -101,10 +102,11 @@ static void print_ctrlmode(FILE *f, __u32 cm)_PF (CAN_CTRLMODE_ONE_SHOT ,"ONE-SHOT" );_PF (CAN_CTRLMODE_BERR_REPORTING ,"BERR-REPORTING" );_PF (CAN_CTRLMODE_FD ,"FD" );_PF (CAN_CTRLMODE_FD_NON_ISO ,"FD-NON-ISO" );_PF (CAN_CTRLMODE_PRESUME_ACK ,"PRESUME-ACK" ); +_PF (CAN_CTRLMODE_CC_LEN8_DLC ,"CC-LEN8-DLC" );#undef _PFif (cm)print_hex (PRINT_ANY ,NULL ,"%x" , cm);close_json_array (PRINT_ANY ,"> " ); }
@@ -209,10 +211,14 @@ static int can_parse_opt(struct link_util *lu, int argc, char **argv, CAN_CTRLMODE_FD_NON_ISO); }else if (matches (*argv,"presume-ack" ) ==0 ) {NEXT_ARG ();set_ctrlmode ("presume-ack" , *argv, &cm,CAN_CTRLMODE_PRESUME_ACK ); + }else if (matches (*argv,"cc-len8-dlc" ) ==0 ) { +NEXT_ARG (); +set_ctrlmode ("cc-len8-dlc" , *argv, &cm, +CAN_CTRLMODE_CC_LEN8_DLC ); }else if (matches (*argv,"restart" ) ==0 ) {__u32 val =1 ;addattr32 (n,1024 ,IFLA_CAN_RESTART , val); }else if (matches (*argv,"restart-ms" ) ==0 ) {
Signature · 1 line
2.28.0