can: mcp251x: fix generation of error frames
authorMarc Kleine-Budde <mkl@pengutronix.de>
Wed, 20 Oct 2010 00:02:26 +0000 (00:02 +0000)
committerDavid S. Miller <davem@davemloft.net>
Thu, 21 Oct 2010 11:27:03 +0000 (04:27 -0700)
commit612eef4f4714d5c0e7127b7b245dbfc444d14a4b
tree3b04fca92d4d043163b36fbd8694d025e52c66ea
parent5601b2dfae86198667dd6e075a074fbef0c83423
can: mcp251x: fix generation of error frames

The function "mcp251x_error_skb" is used to generate error frames.
They are identified by the "CAN_ERR_FLAG" in can_id. The function
overwrites the can_id so that the frames show up as normal frames instead
of error frames.

This patch fixes the problem by or'ing the can_id instead of overwriting it.

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Tested-by: Jargalan Nermunkh <jargalan.nermunkh@criticallink.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/can/mcp251x.c