diff options
| author | David S. Miller <davem@davemloft.net> | 2012-07-07 16:29:29 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-07-07 16:29:29 -0700 |
| commit | 8f961faef791f6cc8fb1d10817fa7af3efcb544e (patch) | |
| tree | 0d4ecd861c575d7ebd235cea61eeea7cac034a25 /include | |
| parent | 95162d652477f6e3d04687f5d39d443fcc64d8d7 (diff) | |
| parent | f057bbb6f9ed0fb61ea11105c9ef0ed5ac1a354d (diff) | |
| download | linux-8f961faef791f6cc8fb1d10817fa7af3efcb544e.tar.gz linux-8f961faef791f6cc8fb1d10817fa7af3efcb544e.tar.bz2 linux-8f961faef791f6cc8fb1d10817fa7af3efcb544e.zip | |
Merge branch 'for-davem' of git://gitorious.org/linux-can/linux-can-next
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/can.h | 3 | ||||
| -rw-r--r-- | include/linux/pkt_cls.h | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/include/linux/can.h b/include/linux/can.h index 1a66cf6112ae..018055efc034 100644 --- a/include/linux/can.h +++ b/include/linux/can.h @@ -38,6 +38,9 @@ */ typedef __u32 canid_t; +#define CAN_SFF_ID_BITS 11 +#define CAN_EFF_ID_BITS 29 + /* * Controller Area Network Error Message Frame Mask structure * diff --git a/include/linux/pkt_cls.h b/include/linux/pkt_cls.h index defbde203d07..38fbd4bc20ab 100644 --- a/include/linux/pkt_cls.h +++ b/include/linux/pkt_cls.h @@ -451,8 +451,9 @@ enum { #define TCF_EM_U32 3 #define TCF_EM_META 4 #define TCF_EM_TEXT 5 -#define TCF_EM_VLAN 6 -#define TCF_EM_MAX 6 +#define TCF_EM_VLAN 6 +#define TCF_EM_CANID 7 +#define TCF_EM_MAX 7 enum { TCF_EM_PROG_TC |