Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b30749fd authored by Oliver Hartkopp's avatar Oliver Hartkopp Committed by Marc Kleine-Budde
Browse files

can: only send bitrate data via netlink when available 



When setting the bitrate both can_calc_bittiming() and can_fixup_bittiming()
lead to the bitrate variable to be set, when a proper bit timing is available.
Only then the bitrate configuration is stored for the device, so checking for
priv->bittiming.bitrate is always sufficient.

Signed-off-by: default avatarOliver Hartkopp <socketcan@hartkopp.net>
Acked-by: default avatarStephane Grosjean <s.grosjean@peak-system.com>
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent a94bc9c4

drivers/net/can/dev.c

+6 −4
Original line number Original line Diff line number Diff line
@@ -606,7 +606,7 @@ int open_candev(struct net_device *dev) 
{

{

	struct can_priv *priv = netdev_priv(dev);

	struct can_priv *priv = netdev_priv(dev);





	if (!priv->bittiming.tq && !priv->bittiming.bitrate) {

	if (!priv->bittiming.bitrate) {

		netdev_err(dev, "bit-timing not yet defined\n");

		netdev_err(dev, "bit-timing not yet defined\n");

		return -EINVAL;

		return -EINVAL;

	}

	}
@@ -719,7 +719,8 @@ static size_t can_get_size(const struct net_device *dev) 
	struct can_priv *priv = netdev_priv(dev);

	struct can_priv *priv = netdev_priv(dev);

	size_t size = 0;

	size_t size = 0;





	size += nla_total_size(sizeof(struct can_bittiming));	/* IFLA_CAN_BITTIMING */

	if (priv->bittiming.bitrate)				/* IFLA_CAN_BITTIMING */

		size += nla_total_size(sizeof(struct can_bittiming));

	if (priv->bittiming_const)				/* IFLA_CAN_BITTIMING_CONST */

	if (priv->bittiming_const)				/* IFLA_CAN_BITTIMING_CONST */

		size += nla_total_size(sizeof(struct can_bittiming_const));

		size += nla_total_size(sizeof(struct can_bittiming_const));

	size += nla_total_size(sizeof(struct can_clock));	/* IFLA_CAN_CLOCK */

	size += nla_total_size(sizeof(struct can_clock));	/* IFLA_CAN_CLOCK */
@@ -741,8 +742,9 @@ static int can_fill_info(struct sk_buff *skb, const struct net_device *dev) 




	if (priv->do_get_state)

	if (priv->do_get_state)

		priv->do_get_state(dev, &state);

		priv->do_get_state(dev, &state);

	if (nla_put(skb, IFLA_CAN_BITTIMING,

	if ((priv->bittiming.bitrate &&

		    sizeof(priv->bittiming), &priv->bittiming) ||

	     nla_put(skb, IFLA_CAN_BITTIMING,

		     sizeof(priv->bittiming), &priv->bittiming)) ||

	    (priv->bittiming_const &&

	    (priv->bittiming_const &&

	     nla_put(skb, IFLA_CAN_BITTIMING_CONST,

	     nla_put(skb, IFLA_CAN_BITTIMING_CONST,

		     sizeof(*priv->bittiming_const), priv->bittiming_const)) ||

		     sizeof(*priv->bittiming_const), priv->bittiming_const)) ||