diff options
| author | David S. Miller <davem@davemloft.net> | 2017-04-25 17:52:47 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-04-25 17:52:47 +0300 |
| commit | 45a6f3bca64ac8f462a275f351dcc3f032073d92 (patch) | |
| tree | a012e3e981c39e66e6c94c11984533ddb1ae5b38 /include/uapi | |
| parent | 3133822f5ac13b04c2ca46f27cfe74606bbd4a6d (diff) | |
| parent | b655f0e96d4061eac42dea2dccd37a3348d1f3f3 (diff) | |
| download | linux-45a6f3bca64ac8f462a275f351dcc3f032073d92.tar.xz | |
Merge tag 'linux-can-next-for-4.12-20170425' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next
Marc Kleine-Budde says:
====================
pull-request: can-next 2017-04-25
this is a pull request of 21 patches for net-next/master.
There are 4 patches by Stephane Grosjean for the PEAK PCAN-PCIe FD
CAN-FD boards. The next 7 patches are by Mario Huettel, which add
support for M_CAN IP version >= v3.1.x to the m_can driver. A patch by
Remigiusz Kołłątaj adds support for the Microchip CAN BUS Analyzer. 8
patches by Oliver Hartkopp complete the initial CAN network namespace
support. Wei Yongjun's patch for the ti_hecc driver fixes the return
value check in the probe function.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/linux/can/vxcan.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/include/uapi/linux/can/vxcan.h b/include/uapi/linux/can/vxcan.h new file mode 100644 index 000000000000..ffb0b7156f7e --- /dev/null +++ b/include/uapi/linux/can/vxcan.h @@ -0,0 +1,12 @@ +#ifndef _UAPI_CAN_VXCAN_H +#define _UAPI_CAN_VXCAN_H + +enum { + VXCAN_INFO_UNSPEC, + VXCAN_INFO_PEER, + + __VXCAN_INFO_MAX +#define VXCAN_INFO_MAX (__VXCAN_INFO_MAX - 1) +}; + +#endif |