diff options
| author |   Oliver Hartkopp <socketcan@hartkopp.net> | 2014-02-28 16:36:23 +0100 |
|---|---|---|
| committer |   Marc Kleine-Budde <mkl@pengutronix.de> | 2014-03-07 09:18:22 +0100 |
| commit | 9859ccd2c8be63ce939522e63e265f2b0caa1109 (patch) | |
| tree | aae08f7351b66eb224ce7b48763569d6189e3c7b /include/linux/can | |
| parent | can: provide a separate bittiming_const parameter to bittiming functions (diff) | |
| download | linux-dev-9859ccd2c8be63ce939522e63e265f2b0caa1109.tar.xz linux-dev-9859ccd2c8be63ce939522e63e265f2b0caa1109.zip | |
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>
Diffstat (limited to 'include/linux/can')
| -rw-r--r-- | include/linux/can/dev.h | 6 |
1 files changed, 4 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); |