diff options
| author | David S. Miller <davem@davemloft.net> | 2012-06-19 14:47:13 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-06-19 14:47:13 -0700 |
| commit | 3879d4e3977329607a2a8042483140af3581b5c3 (patch) | |
| tree | c9e8cd2b3a99ddc917bced812fa2265150d45c44 /include/linux/can/raw.h | |
| parent | a77f4b4acf5b77f038bc11d3ca9b3af6f0124015 (diff) | |
| parent | ea53fe0c667ad3cae61d4d71d2be41908ac5c0a4 (diff) | |
Merge branch 'master' of git://gitorious.org/linux-can/linux-can-next
Marc Kleine-Budde says:
====================
here is our second pull request for net-next. In this series Federico
Vaga adds a pci driver for c_can/d_can hardware using the existing
generic c_can driver. The remaining 6 patches are by Oliver Hartkopp.
He adds CANFD support to the CAN stack while keeping binary
compatibility for existing applications. CANFD is an extension to the
existing CAN standard, it allows longer CAN frames and/or higher data
rates. There's no real hardware available yet, but this series adds
CANFD support to the vcan driver.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/can/raw.h')
| -rw-r--r-- | include/linux/can/raw.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/can/raw.h b/include/linux/can/raw.h index 781f3a3701be..a814062b0719 100644 --- a/include/linux/can/raw.h +++ b/include/linux/can/raw.h @@ -23,7 +23,8 @@ enum { CAN_RAW_FILTER = 1, /* set 0 .. n can_filter(s) */ CAN_RAW_ERR_FILTER, /* set filter for error frames */ CAN_RAW_LOOPBACK, /* local loopback (default:on) */ - CAN_RAW_RECV_OWN_MSGS /* receive my own msgs (default:off) */ + CAN_RAW_RECV_OWN_MSGS, /* receive my own msgs (default:off) */ + CAN_RAW_FD_FRAMES, /* allow CAN FD frames (default:off) */ }; #endif |