can: bittiming: rename CAN_CTRLMODE_TDC_MASK into CAN_CTRLMODE_FD_TDC_MASK

With the introduction of CAN XL, a new CAN_CTRLMODE_XL_TDC_MASK will
be introduced later on. Because CAN_CTRLMODE_TDC_MASK is not part of
the uapi, rename it to CAN_CTRLMODE_FD_TDC_MASK to make it more
explicit that this mask is meant for CAN FD.

Signed-off-by: Vincent Mailhol <mailhol.vincent@wanadoo.fr>
Link: https://patch.msgid.link/20241112165118.586613-10-mailhol.vincent@wanadoo.fr
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

diff --git a/drivers/net/can/dev/calc_bittiming.c b/drivers/net/can/dev/calc_bittiming.c
index 3809c148fb88852a8d2c15402913c9bc8d835857..a94bd67c670c4801344e1fed6372d0182c46271f 100644 (file)
--- a/drivers/net/can/dev/calc_bittiming.c
+++ b/drivers/net/can/dev/calc_bittiming.c
@@ -179,7 +179,7 @@ void can_calc_tdco(struct can_tdc *tdc, const struct can_tdc_const *tdc_const,
        if (!tdc_const || !(ctrlmode_supported & CAN_CTRLMODE_TDC_AUTO))
                return;
 
-       *ctrlmode &= ~CAN_CTRLMODE_TDC_MASK;
+       *ctrlmode &= ~CAN_CTRLMODE_FD_TDC_MASK;
 
        /* As specified in ISO 11898-1 section 11.3.3 "Transmitter
         * delay compensation" (TDC) is only applicable if data BRP is

diff --git a/drivers/net/can/dev/netlink.c b/drivers/net/can/dev/netlink.c
index 4ebd5181aea9d39037fc6d9ae0c27f3ab6750b21..08261cfcf6b2ec7b4d9b928a1d76b77bc2dd86c2 100644 (file)
--- a/drivers/net/can/dev/netlink.c
+++ b/drivers/net/can/dev/netlink.c
@@ -67,12 +67,12 @@ static int can_validate(struct nlattr *tb[], struct nlattr *data[],
 
        if (data[IFLA_CAN_CTRLMODE]) {
                struct can_ctrlmode *cm = nla_data(data[IFLA_CAN_CTRLMODE]);
-               u32 tdc_flags = cm->flags & CAN_CTRLMODE_TDC_MASK;
+               u32 tdc_flags = cm->flags & CAN_CTRLMODE_FD_TDC_MASK;
 
                is_can_fd = cm->flags & cm->mask & CAN_CTRLMODE_FD;
 
                /* CAN_CTRLMODE_TDC_{AUTO,MANUAL} are mutually exclusive */
-               if (tdc_flags == CAN_CTRLMODE_TDC_MASK)
+               if (tdc_flags == CAN_CTRLMODE_FD_TDC_MASK)
                        return -EOPNOTSUPP;
                /* If one of the CAN_CTRLMODE_TDC_* flag is set then
                 * TDC must be set and vice-versa
@@ -230,16 +230,16 @@ static int can_changelink(struct net_device *dev, struct nlattr *tb[],
                        dev->mtu = CAN_MTU;
                        memset(&priv->fd.data_bittiming, 0,
                               sizeof(priv->fd.data_bittiming));
-                       priv->ctrlmode &= ~CAN_CTRLMODE_TDC_MASK;
+                       priv->ctrlmode &= ~CAN_CTRLMODE_FD_TDC_MASK;
                        memset(&priv->fd.tdc, 0, sizeof(priv->fd.tdc));
                }
 
-               tdc_mask = cm->mask & CAN_CTRLMODE_TDC_MASK;
+               tdc_mask = cm->mask & CAN_CTRLMODE_FD_TDC_MASK;
                /* CAN_CTRLMODE_TDC_{AUTO,MANUAL} are mutually
                 * exclusive: make sure to turn the other one off
                 */
                if (tdc_mask)
-                       priv->ctrlmode &= cm->flags | ~CAN_CTRLMODE_TDC_MASK;
+                       priv->ctrlmode &= cm->flags | ~CAN_CTRLMODE_FD_TDC_MASK;
        }
 
        if (data[IFLA_CAN_BITTIMING]) {
@@ -339,7 +339,7 @@ static int can_changelink(struct net_device *dev, struct nlattr *tb[],
                        err = can_tdc_changelink(priv, data[IFLA_CAN_TDC],
                                                 extack);
                        if (err) {
-                               priv->ctrlmode &= ~CAN_CTRLMODE_TDC_MASK;
+                               priv->ctrlmode &= ~CAN_CTRLMODE_FD_TDC_MASK;
                                return err;
                        }
                } else if (!tdc_mask) {

diff --git a/include/linux/can/bittiming.h b/include/linux/can/bittiming.h
index 9b8a9c39614bfb19ba0c76f48b6e4ad434ad3aab..5dfdbb63b1d54f3dc02170b10b73dbb9c2242851 100644 (file)
--- a/include/linux/can/bittiming.h
+++ b/include/linux/can/bittiming.h
@@ -14,7 +14,7 @@
 #define CAN_BITRATE_UNSET 0
 #define CAN_BITRATE_UNKNOWN (-1U)
 
-#define CAN_CTRLMODE_TDC_MASK                                  \
+#define CAN_CTRLMODE_FD_TDC_MASK                               \
        (CAN_CTRLMODE_TDC_AUTO | CAN_CTRLMODE_TDC_MANUAL)
 
 /*

diff --git a/include/linux/can/dev.h b/include/linux/can/dev.h
index 492d23bec7bebbf120152f8eeb702ce70483d6a6..e492dfa8a4727e20caafbcff5583dedc2f769a2b 100644 (file)
--- a/include/linux/can/dev.h
+++ b/include/linux/can/dev.h
@@ -93,7 +93,7 @@ struct can_priv {
 
 static inline bool can_tdc_is_enabled(const struct can_priv *priv)
 {
-       return !!(priv->ctrlmode & CAN_CTRLMODE_TDC_MASK);
+       return !!(priv->ctrlmode & CAN_CTRLMODE_FD_TDC_MASK);
 }
 
 /*