can: dev: sort can_get_size() by IFLA_CAN_*
authorMarc Kleine-Budde <mkl@pengutronix.de>
Sat, 5 Oct 2013 18:34:47 +0000 (20:34 +0200)
committerMarc Kleine-Budde <mkl@pengutronix.de>
Thu, 31 Oct 2013 19:55:13 +0000 (20:55 +0100)
This patch sorts the individual addends of the sum by IFLA_CAN_*.

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
drivers/net/can/dev.c

index 1870c47..19ebab0 100644 (file)
@@ -702,17 +702,17 @@ static int can_changelink(struct net_device *dev,
 static size_t can_get_size(const struct net_device *dev)
 {
        struct can_priv *priv = netdev_priv(dev);
-       size_t size;
-
-       size = nla_total_size(sizeof(u32));   /* IFLA_CAN_STATE */
-       size += nla_total_size(sizeof(struct can_ctrlmode));  /* IFLA_CAN_CTRLMODE */
-       size += nla_total_size(sizeof(u32));  /* IFLA_CAN_RESTART_MS */
-       size += nla_total_size(sizeof(struct can_bittiming)); /* IFLA_CAN_BITTIMING */
-       size += nla_total_size(sizeof(struct can_clock));     /* IFLA_CAN_CLOCK */
-       if (priv->do_get_berr_counter)        /* IFLA_CAN_BERR_COUNTER */
-               size += nla_total_size(sizeof(struct can_berr_counter));
-       if (priv->bittiming_const)            /* IFLA_CAN_BITTIMING_CONST */
+       size_t size = 0;
+
+       size += nla_total_size(sizeof(struct can_bittiming));   /* IFLA_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 */
+       size += nla_total_size(sizeof(u32));                    /* IFLA_CAN_STATE */
+       size += nla_total_size(sizeof(struct can_ctrlmode));    /* IFLA_CAN_CTRLMODE */
+       size += nla_total_size(sizeof(u32));                    /* IFLA_CAN_RESTART_MS */
+       if (priv->do_get_berr_counter)                          /* IFLA_CAN_BERR_COUNTER */
+               size += nla_total_size(sizeof(struct can_berr_counter));
 
        return size;
 }