can: introduce the data bitrate configuration for CAN FD

As CAN FD offers a second bitrate for the data section of the CAN frame the
infrastructure for storing and configuring this second bitrate is introduced.
Improved the readability of the if-statement by inserting some newlines.

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>

2 files changed, 6 insertions, 2 deletions

diff --git a/include/linux/can/dev.h b/include/linux/can/dev.h
index dc5f9026b67f..8adaee96f292 100644
--- a/include/linux/can/dev.h
+++ b/include/linux/can/dev.h
@@ -33,8 +33,9 @@ enum can_mode {
 struct can_priv {
         struct can_device_stats can_stats;
 
-        struct can_bittiming bittiming;
-        const struct can_bittiming_const *bittiming_const;
+        struct can_bittiming bittiming, data_bittiming;
+        const struct can_bittiming_const *bittiming_const,
+                *data_bittiming_const;
         struct can_clock clock;
 
         enum can_state state;
@@ -45,6 +46,7 @@ struct can_priv {
         struct timer_list restart_timer;
 
         int (*do_set_bittiming)(struct net_device *dev);
+        int (*do_set_data_bittiming)(struct net_device *dev);
         int (*do_set_mode)(struct net_device *dev, enum can_mode mode);
         int (*do_get_state)(const struct net_device *dev,
                             enum can_state *state);
diff --git a/include/uapi/linux/can/netlink.h b/include/uapi/linux/can/netlink.h
index df944ed206a8..b41933d6bdcd 100644
--- a/include/uapi/linux/can/netlink.h
+++ b/include/uapi/linux/can/netlink.h
@@ -122,6 +122,8 @@ enum {
         IFLA_CAN_RESTART_MS,
         IFLA_CAN_RESTART,
         IFLA_CAN_BERR_COUNTER,
+        IFLA_CAN_DATA_BITTIMING,
+        IFLA_CAN_DATA_BITTIMING_CONST,
         __IFLA_CAN_MAX
 };