iplink_can: add struct can_tdc

Add the struct can_tdc to group the tdcv, tdco and tdvf variables
together. The structure is borrowed from linux/can/bittiming.h [1].

This refactor is a preparation for the introduction of CAN XL.

[1] https://elixir.bootlin.com/linux/v6.11/source/include/linux/can/bittiming.h#L78

Signed-off-by: Vincent Mailhol <mailhol.vincent@wanadoo.fr>
Signed-off-by: David Ahern <dsahern@kernel.org>

diff --git a/ip/iplink_can.c b/ip/iplink_can.c
index 928d5d79f3c529abc4ccc341c6e945a7a83d0b37..325a4007307507de8786477a61e85ac742cdb2aa 100644 (file)
--- a/ip/iplink_can.c
+++ b/ip/iplink_can.c
@@ -15,6 +15,12 @@
 #include "utils.h"
 #include "ip_common.h"
 
+struct can_tdc {
+       __u32 tdcv;
+       __u32 tdco;
+       __u32 tdcf;
+};
+
 static void print_usage(FILE *f)
 {
        fprintf(f,
@@ -128,7 +134,7 @@ static int can_parse_opt(struct link_util *lu, int argc, char **argv,
 {
        struct can_bittiming bt = {}, dbt = {};
        struct can_ctrlmode cm = { 0 };
-       __u32 tdcv = -1, tdco = -1, tdcf = -1;
+       struct can_tdc fd = { .tdcv = -1, .tdco = -1, .tdcf = -1 };
 
        while (argc > 0) {
                if (matches(*argv, "bitrate") == 0) {
@@ -196,15 +202,15 @@ static int can_parse_opt(struct link_util *lu, int argc, char **argv,
                                invarg("invalid \"dsjw\" value", *argv);
                } else if (matches(*argv, "tdcv") == 0) {
                        NEXT_ARG();
-                       if (get_u32(&tdcv, *argv, 0))
+                       if (get_u32(&fd.tdcv, *argv, 0))
                                invarg("invalid \"tdcv\" value", *argv);
                } else if (matches(*argv, "tdco") == 0) {
                        NEXT_ARG();
-                       if (get_u32(&tdco, *argv, 0))
+                       if (get_u32(&fd.tdco, *argv, 0))
                                invarg("invalid \"tdco\" value", *argv);
                } else if (matches(*argv, "tdcf") == 0) {
                        NEXT_ARG();
-                       if (get_u32(&tdcf, *argv, 0))
+                       if (get_u32(&fd.tdcf, *argv, 0))
                                invarg("invalid \"tdcf\" value", *argv);
                } else if (matches(*argv, "loopback") == 0) {
                        NEXT_ARG();
@@ -294,16 +300,16 @@ static int can_parse_opt(struct link_util *lu, int argc, char **argv,
        if (cm.mask)
                addattr_l(n, 1024, IFLA_CAN_CTRLMODE, &cm, sizeof(cm));
 
-       if (tdcv != -1 || tdco != -1 || tdcf != -1) {
+       if (fd.tdcv != -1 || fd.tdco != -1 || fd.tdcf != -1) {
                struct rtattr *tdc = addattr_nest(n, 1024,
                                                  IFLA_CAN_TDC | NLA_F_NESTED);
 
-               if (tdcv != -1)
-                       addattr32(n, 1024, IFLA_CAN_TDC_TDCV, tdcv);
-               if (tdco != -1)
-                       addattr32(n, 1024, IFLA_CAN_TDC_TDCO, tdco);
-               if (tdcf != -1)
-                       addattr32(n, 1024, IFLA_CAN_TDC_TDCF, tdcf);
+               if (fd.tdcv != -1)
+                       addattr32(n, 1024, IFLA_CAN_TDC_TDCV, fd.tdcv);
+               if (fd.tdco != -1)
+                       addattr32(n, 1024, IFLA_CAN_TDC_TDCO, fd.tdco);
+               if (fd.tdcf != -1)
+                       addattr32(n, 1024, IFLA_CAN_TDC_TDCF, fd.tdcf);
                addattr_nest_end(n, tdc);
        }