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: Oliver Hartkopp <socketcan@hartkopp.net>
Acked-by: Stephane Grosjean <s.grosjean@peak-system.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

1 files changed, 6 insertions, 4 deletions

diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c
index e1a37413d53e..de04eac7c5f3 100644
--- a/drivers/net/can/dev.c
+++ b/drivers/net/can/dev.c
@@ -606,7 +606,7 @@ int open_candev(struct net_device *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");
                 return -EINVAL;
         }
@@ -719,7 +719,8 @@ static size_t can_get_size(const struct net_device *dev)
         struct can_priv *priv = netdev_priv(dev);
         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 */
                 size += nla_total_size(sizeof(struct can_bittiming_const));
         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)
                 priv->do_get_state(dev, &state);
-        if (nla_put(skb, IFLA_CAN_BITTIMING,
-                    sizeof(priv->bittiming), &priv->bittiming) ||
+        if ((priv->bittiming.bitrate &&
+             nla_put(skb, IFLA_CAN_BITTIMING,
+                     sizeof(priv->bittiming), &priv->bittiming)) ||
             (priv->bittiming_const &&
              nla_put(skb, IFLA_CAN_BITTIMING_CONST,
                      sizeof(*priv->bittiming_const), priv->bittiming_const)) ||