From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marc Kleine-Budde Subject: [PATCH 4/9] can: sja1000: don't copy data to rx'ed RTR frames Date: Sat, 25 Dec 2010 15:40:29 +0100 Message-ID: <1293288034-22428-5-git-send-email-mkl@pengutronix.de> References: <1293288034-22428-1-git-send-email-mkl@pengutronix.de> Cc: socketcan-core@lists.berlios.de, Marc Kleine-Budde , Wolfgang Grandegger To: netdev@vger.kernel.org Return-path: Received: from metis.ext.pengutronix.de ([92.198.50.35]:57224 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751138Ab0LYOkq (ORCPT ); Sat, 25 Dec 2010 09:40:46 -0500 In-Reply-To: <1293288034-22428-1-git-send-email-mkl@pengutronix.de> Sender: netdev-owner@vger.kernel.org List-ID: Signed-off-by: Marc Kleine-Budde Cc: Wolfgang Grandegger Acked-by: Wolfgang Grandegger --- drivers/net/can/sja1000/sja1000.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/net/can/sja1000/sja1000.c b/drivers/net/can/sja1000/sja1000.c index 0a8de01..bb4bfe3 100644 --- a/drivers/net/can/sja1000/sja1000.c +++ b/drivers/net/can/sja1000/sja1000.c @@ -346,13 +346,12 @@ static void sja1000_rx(struct net_device *dev) | (priv->read_reg(priv, REG_ID2) >> 5); } - if (fi & FI_RTR) { + cf->can_dlc = get_can_dlc(fi & 0x0F); + if (fi & FI_RTR) id |= CAN_RTR_FLAG; - } else { - cf->can_dlc = get_can_dlc(fi & 0x0F); + else for (i = 0; i < cf->can_dlc; i++) cf->data[i] = priv->read_reg(priv, dreg++); - } cf->can_id = id; -- 1.7.2.3