]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
can: netlink: can_changelink(): rename tdc_mask into fd_tdc_flag_provided
authorVincent Mailhol <mailhol.vincent@wanadoo.fr>
Tue, 12 Nov 2024 16:50:20 +0000 (01:50 +0900)
committerMarc Kleine-Budde <mkl@pengutronix.de>
Tue, 10 Jun 2025 07:34:32 +0000 (09:34 +0200)
The only purpose of the tdc_mask variable is to check whether or not
any tdc flags (CAN_CTRLMODE_TDC_{AUTO,MANUAL}) were provided. At this
point, the actual value of the flags do no matter any more because
these can be deduced from some other information.

Rename the tdc_mask variable into fd_tdc_flag_provided to make this
more explicit. Note that the fd_ prefix is added in preparation of the
introduction of CAN XL.

Signed-off-by: Vincent Mailhol <mailhol.vincent@wanadoo.fr>
Link: https://patch.msgid.link/20241112165118.586613-12-mailhol.vincent@wanadoo.fr
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
drivers/net/can/dev/netlink.c

index 16b0f326c143bef15e1f04b6b5a255730f8067b7..13826e8a707b45a530bac34ee30e4df21800c4e3 100644 (file)
@@ -189,7 +189,7 @@ static int can_changelink(struct net_device *dev, struct nlattr *tb[],
                          struct netlink_ext_ack *extack)
 {
        struct can_priv *priv = netdev_priv(dev);
-       u32 tdc_mask = 0;
+       bool fd_tdc_flag_provided = false;
        int err;
 
        /* We need synchronization with dev->stop() */
@@ -234,11 +234,11 @@ static int can_changelink(struct net_device *dev, struct nlattr *tb[],
                        memset(&priv->fd.tdc, 0, sizeof(priv->fd.tdc));
                }
 
-               tdc_mask = cm->mask & CAN_CTRLMODE_FD_TDC_MASK;
+               fd_tdc_flag_provided = 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)
+               if (fd_tdc_flag_provided)
                        priv->ctrlmode &= cm->flags | ~CAN_CTRLMODE_FD_TDC_MASK;
        }
 
@@ -342,7 +342,7 @@ static int can_changelink(struct net_device *dev, struct nlattr *tb[],
                                priv->ctrlmode &= ~CAN_CTRLMODE_FD_TDC_MASK;
                                return err;
                        }
-               } else if (!tdc_mask) {
+               } else if (!fd_tdc_flag_provided) {
                        /* Neither of TDC parameters nor TDC flags are
                         * provided: do calculation
                         */