diff options
author | Oliver Hartkopp <socketcan@hartkopp.net> | 2014-02-28 10:36:24 -0500 |
---|---|---|
committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2014-03-07 03:18:23 -0500 |
commit | bc05a8944a344acdb81a65de055ca6febbf9657c (patch) | |
tree | bf3e474f5bac669b5a9d4b3d07aa7119875334fc /include | |
parent | 9859ccd2c8be63ce939522e63e265f2b0caa1109 (diff) |
can: allow to change the device mtu for CAN FD capable devices
The configuration for CAN FD depends on CAN_CTRLMODE_FD enabled in the driver
specific ctrlmode_supported capabilities.
The configuration can be done either with the 'fd { on | off }' option in the
'ip' tool from iproute2 or by setting the CAN netdevice MTU to CAN_MTU (16) or
to CANFD_MTU (72).
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')
-rw-r--r-- | include/linux/can/dev.h | 1 | ||||
-rw-r--r-- | include/uapi/linux/can/netlink.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/can/dev.h b/include/linux/can/dev.h index 8adaee96f292..3ce5e526525f 100644 --- a/include/linux/can/dev.h +++ b/include/linux/can/dev.h | |||
@@ -113,6 +113,7 @@ struct can_priv *safe_candev_priv(struct net_device *dev); | |||
113 | 113 | ||
114 | int open_candev(struct net_device *dev); | 114 | int open_candev(struct net_device *dev); |
115 | void close_candev(struct net_device *dev); | 115 | void close_candev(struct net_device *dev); |
116 | int can_change_mtu(struct net_device *dev, int new_mtu); | ||
116 | 117 | ||
117 | int register_candev(struct net_device *dev); | 118 | int register_candev(struct net_device *dev); |
118 | void unregister_candev(struct net_device *dev); | 119 | void unregister_candev(struct net_device *dev); |
diff --git a/include/uapi/linux/can/netlink.h b/include/uapi/linux/can/netlink.h index b41933d6bdcd..7e2e1863db16 100644 --- a/include/uapi/linux/can/netlink.h +++ b/include/uapi/linux/can/netlink.h | |||
@@ -96,6 +96,7 @@ struct can_ctrlmode { | |||
96 | #define CAN_CTRLMODE_3_SAMPLES 0x04 /* Triple sampling mode */ | 96 | #define CAN_CTRLMODE_3_SAMPLES 0x04 /* Triple sampling mode */ |
97 | #define CAN_CTRLMODE_ONE_SHOT 0x08 /* One-Shot mode */ | 97 | #define CAN_CTRLMODE_ONE_SHOT 0x08 /* One-Shot mode */ |
98 | #define CAN_CTRLMODE_BERR_REPORTING 0x10 /* Bus-error reporting */ | 98 | #define CAN_CTRLMODE_BERR_REPORTING 0x10 /* Bus-error reporting */ |
99 | #define CAN_CTRLMODE_FD 0x20 /* CAN FD mode */ | ||
99 | 100 | ||
100 | /* | 101 | /* |
101 | * CAN device statistics | 102 | * CAN device statistics |