Marc Kleine-Budde says: ==================== pull-request: can-next 2014-12-07 this is a pull request of 8 patches for net-next/master. Andri Yngvason contributes 4 patches in which the CAN state change handling is consolidated and unified among the sja1000, mscan and flexcan driver. The three patches by Jeremiah Mahler fix spelling mistakes and eliminate the banner[] variable in various parts. And a patch by me that switches on sparse endianess checking by default. ====================
Showing the changes to include/uapi/linux (1 of 14 files). Show all
Unified · Split
| @@ -71,6 +71,7 @@ · 70 unmodified lines | ||
| 71 | 71 | #define CAN_ERR_CRTL_TX_PASSIVE 0x20 /* reached error passive status TX */ |
| 72 | 72 | /* (at least one error counter exceeds */ |
| 73 | 73 | /* the protocol-defined level of 127) */ |
| 74 | +#define CAN_ERR_CRTL_ACTIVE 0x40 /* recovered to error active state */ | |
| 74 | 75 | |
| 75 | 76 | /* error in CAN protocol (type) / data[2] */ |
| 76 | 77 | #define CAN_ERR_PROT_UNSPEC 0x00 /* unspecified */ |