diff options
author | Uwe Kleine-Koenig <ukl@pengutronix.de> | 2008-12-12 11:18:54 +0100 |
---|---|---|
committer | Uwe Kleine-Koenig <ukl@pengutronix.de> | 2008-12-12 11:18:54 +0100 |
commit | 7971db5a4b4176ad5df590fce07a962c643a2740 (patch) | |
tree | 6ad8e09c5376c4e4c532c3411b0171ba1011acd9 /net/can/bcm.c | |
parent | d403700bf8fc903584e830967f5d64075770848c (diff) | |
parent | c4edfced662fa64deeed89c7d8c9f96d86130c19 (diff) | |
download | kernel_samsung_smdk4412-7971db5a4b4176ad5df590fce07a962c643a2740.zip kernel_samsung_smdk4412-7971db5a4b4176ad5df590fce07a962c643a2740.tar.gz kernel_samsung_smdk4412-7971db5a4b4176ad5df590fce07a962c643a2740.tar.bz2 |
Merge branch 'for-rmk-misc' into for-rmk
Diffstat (limited to 'net/can/bcm.c')
-rw-r--r-- | net/can/bcm.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/can/bcm.c b/net/can/bcm.c index d0dd382..da0d426 100644 --- a/net/can/bcm.c +++ b/net/can/bcm.c @@ -64,10 +64,11 @@ #define BCM_CAN_DLC_MASK 0x0F /* clean private flags in can_dlc by masking */ /* get best masking value for can_rx_register() for a given single can_id */ -#define REGMASK(id) ((id & CAN_RTR_FLAG) | ((id & CAN_EFF_FLAG) ? \ - (CAN_EFF_MASK | CAN_EFF_FLAG) : CAN_SFF_MASK)) +#define REGMASK(id) ((id & CAN_EFF_FLAG) ? \ + (CAN_EFF_MASK | CAN_EFF_FLAG | CAN_RTR_FLAG) : \ + (CAN_SFF_MASK | CAN_EFF_FLAG | CAN_RTR_FLAG)) -#define CAN_BCM_VERSION "20080415" +#define CAN_BCM_VERSION CAN_VERSION static __initdata const char banner[] = KERN_INFO "can: broadcast manager protocol (rev " CAN_BCM_VERSION ")\n"; |