From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Wed, 20 Oct 2010 00:02:26 +0000 (+0000)
Subject: can: mcp251x: fix generation of error frames
X-Git-Tag: v2.6.37-rc1~147^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=612eef4f4714d5c0e7127b7b245dbfc444d14a4b;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed