diff options
| author | David S. Miller <davem@davemloft.net> | 2015-04-01 13:58:06 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-04-01 13:58:06 -0400 |
| commit | b9600d2d0901cd0f91cb372e72bd53d22f49638d (patch) | |
| tree | 6684a4fd1345c65a5a91aff272785cd0943d347d /include | |
| parent | 8d88c6ebb34c3e54debe81e9b0d81b60411f8179 (diff) | |
| parent | 79d5eeddd7d23bd4588e370072977928b7075911 (diff) | |
Merge tag 'linux-can-next-for-4.1-20150401' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next
Marc Kleine-Budde says:
====================
pull-request: can-next 2015-04-01
this is a pull request of 5 patches for net-next/master.
There are two patches for the ems_usb driver by Gerhard Uttenthaler and
me, which fix sparse endianess warnings. Oliver Hartkopp adds two
patches to improve and extend the CAN-ID filter handling on RAW CAN
sockets. The last patch is by me, it silences an uninitialized variable
warning in the peak_usb driver.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/uapi/linux/can/raw.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/can/raw.h b/include/uapi/linux/can/raw.h index 78ec76fd89a6..8735f1080385 100644 --- a/include/uapi/linux/can/raw.h +++ b/include/uapi/linux/can/raw.h @@ -57,6 +57,7 @@ enum { CAN_RAW_LOOPBACK, /* local loopback (default:on) */ CAN_RAW_RECV_OWN_MSGS, /* receive my own msgs (default:off) */ CAN_RAW_FD_FRAMES, /* allow CAN FD frames (default:off) */ + CAN_RAW_JOIN_FILTERS, /* all filters must match to trigger */ }; #endif /* !_UAPI_CAN_RAW_H */ |