netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Marc Kleine-Budde <mkl-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
To: davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org
Cc: socketcan-core-0fE9KPoRgkgATYTw5x5z8w@public.gmane.org,
	netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	Marc Kleine-Budde <mkl-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
Subject: [PATCH 03/11] can: at91_can: don't copy data to rx'ed RTR frames
Date: Mon,  6 Jun 2011 15:42:52 +0200	[thread overview]
Message-ID: <1307367780-30715-4-git-send-email-mkl@pengutronix.de> (raw)
In-Reply-To: <1307367780-30715-1-git-send-email-mkl-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>

Signed-off-by: Marc Kleine-Budde <mkl-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
Acked-by: Wolfgang Grandegger <wg-5Yr1BZd7O62+XT7JhA+gdA@public.gmane.org>
---
 drivers/net/can/at91_can.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/net/can/at91_can.c b/drivers/net/can/at91_can.c
index afd0f5d..5358d70 100644
--- a/drivers/net/can/at91_can.c
+++ b/drivers/net/can/at91_can.c
@@ -513,12 +513,14 @@ static void at91_read_mb(struct net_device *dev, unsigned int mb,
 		cf->can_id = (reg_mid >> 18) & CAN_SFF_MASK;
 
 	reg_msr = at91_read(priv, AT91_MSR(mb));
-	if (reg_msr & AT91_MSR_MRTR)
-		cf->can_id |= CAN_RTR_FLAG;
 	cf->can_dlc = get_can_dlc((reg_msr >> 16) & 0xf);
 
-	*(u32 *)(cf->data + 0) = at91_read(priv, AT91_MDL(mb));
-	*(u32 *)(cf->data + 4) = at91_read(priv, AT91_MDH(mb));
+	if (reg_msr & AT91_MSR_MRTR)
+		cf->can_id |= CAN_RTR_FLAG;
+	else {
+		*(u32 *)(cf->data + 0) = at91_read(priv, AT91_MDL(mb));
+		*(u32 *)(cf->data + 4) = at91_read(priv, AT91_MDH(mb));
+	}
 
 	/* allow RX of extended frames */
 	at91_write(priv, AT91_MID(mb), AT91_MID_MIDE);
-- 
1.7.4.1

  parent reply	other threads:[~2011-06-06 13:42 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-06-06 13:42 [PATCH 00/11] can: at91_can: add support for AT91SAM9X5 series Marc Kleine-Budde
2011-06-06 13:42 ` [PATCH 05/11] can: at91_can: directly define AT91_MB_RX_LAST Marc Kleine-Budde
2011-06-06 13:42 ` [PATCH 06/11] can: at91_can: rename AT91_MB_RX_MASK to AT91_IRQ_MB_RX Marc Kleine-Budde
2011-06-06 13:42 ` [PATCH 09/11] can: at91_can: register mb0 sysfs entry only on at91sam9263 Marc Kleine-Budde
2011-06-06 13:43 ` [PATCH 11/11] net/can: allow CAN_AT91 on AT91SAM9X5 Marc Kleine-Budde
     [not found] ` <1307367780-30715-1-git-send-email-mkl-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2011-06-06 13:42   ` [PATCH 01/11] can: at91_can: don't align struct definitions Marc Kleine-Budde
2011-06-06 13:42   ` [PATCH 02/11] can: at91_can: fix comment about priv->tx_next Marc Kleine-Budde
2011-06-06 13:42   ` Marc Kleine-Budde [this message]
2011-06-06 13:42   ` [PATCH 04/11] can: at91_can: let get_tx_* functions return unsigned int Marc Kleine-Budde
2011-06-06 13:42   ` [PATCH 07/11] can: at91_can: convert derived mailbox constants into functions Marc Kleine-Budde
2011-06-06 13:42   ` [PATCH 08/11] can: at91_can: add id_table and convert prime mailbox constats to functions Marc Kleine-Budde
2011-06-06 13:42   ` [PATCH 10/11] can: at91_can: add support for the AT91SAM9X5 SOCs Marc Kleine-Budde
2011-06-07  8:05   ` [PATCH 00/11] can: at91_can: add support for AT91SAM9X5 series David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1307367780-30715-4-git-send-email-mkl@pengutronix.de \
    --to=mkl-bicnvbalz9megne8c9+irq@public.gmane.org \
    --cc=davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org \
    --cc=netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=socketcan-core-0fE9KPoRgkgATYTw5x5z8w@public.gmane.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).