CAN: fixes for linux-can-next backport