Commit 527b99f4 authored by Vincent Mailhol's avatar Vincent Mailhol Committed by Marc Kleine-Budde
Browse files

can: netlink: can_changelink(): rename tdc_mask into fd_tdc_flag_provided 



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: default avatarVincent Mailhol <mailhol.vincent@wanadoo.fr>
Link: https://patch.msgid.link/20241112165118.586613-12-mailhol.vincent@wanadoo.fr


Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent 23c0dc95

drivers/net/can/dev/netlink.c

+4 −4
Original line number Diff line number Diff line
@@ -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

			 */