On 14.08.2021 18:17:48, Vincent Mailhol wrote:
[...]
> static int can_changelink(struct net_device *dev, struct nlattr *tb[],
> struct nlattr *data[],
> struct netlink_ext_ack *extack)
> {
> struct can_priv *priv = netdev_priv(dev);
> + u32 tdc_mask = 0;
> int err;
>
> /* We need synchronization with dev->stop() */
> @@ -107,6 +179,7 @@ static int can_changelink(struct net_device *dev, struct nlattr *tb[],
> struct can_ctrlmode *cm;
> u32 ctrlstatic;
> u32 maskedflags;
> + u32 tdc_flags;
>
> /* Do not allow changing controller mode while running */
> if (dev->flags & IFF_UP)
> @@ -138,7 +211,18 @@ static int can_changelink(struct net_device *dev, struct nlattr *tb[],
> dev->mtu = CAN_MTU;
> memset(&priv->data_bittiming, 0,
> sizeof(priv->data_bittiming));
> + memset(&priv->tdc, 0, sizeof(priv->tdc));
> + priv->ctrlmode &= ~CAN_CTRLMODE_TDC_MASK;
> }
> +
> + tdc_flags = cm->flags & CAN_CTRLMODE_TDC_MASK;
> + /* CAN_CTRLMODE_TDC_{AUTO,MANUAL} are mutually exclusive */
> + if (tdc_flags == CAN_CTRLMODE_TDC_MASK)
> + return -EOPNOTSUPP;
> + /* If one of CAN_CTRLMODE_TDC_* is set then TDC must be set */
> + if (tdc_flags && !data[IFLA_CAN_TDC])
> + return -EOPNOTSUPP;
These don't need information form the can_priv, right? So these checks
can be moved to can_validate()?
> + tdc_mask = cm->mask & CAN_CTRLMODE_TDC_MASK;
> }
Marc
--
Pengutronix e.K. | Marc Kleine-Budde |
Embedded Linux | https://www.pengutronix.de |
Vertretung West/Dortmund | Phone: +49-231-2826-924 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
Attachment:
signature.asc
Description: PGP signature
