diff options
| author | Oliver Hartkopp <socketcan@hartkopp.net> | 2015-06-21 18:50:44 +0200 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2015-06-21 18:58:58 +0200 |
| commit | 36c01245eb8046c16eee6431e7dbfbb302635fa8 (patch) | |
| tree | f53ded9bf6c16fdc6fcb5c9ef9633addf3945fea /net | |
| parent | 7b48f45797be7c4bdbb772de80efe6bdcd78e81d (diff) | |
| download | op-kernel-dev-36c01245eb8046c16eee6431e7dbfbb302635fa8.zip op-kernel-dev-36c01245eb8046c16eee6431e7dbfbb302635fa8.tar.gz | |
can: fix loss of CAN frames in raw_rcv
As reported by Manfred Schlaegl here
http://marc.info/?l=linux-netdev&m=143482089824232&w=2
commit 514ac99c64b "can: fix multiple delivery of a single CAN frame for
overlapping CAN filters" requires the skb->tstamp to be set to check for
identical CAN skbs.
As net timestamping is influenced by several players (netstamp_needed and
netdev_tstamp_prequeue) Manfred missed a proper timestamp which leads to
CAN frame loss.
As skb timestamping became now mandatory for CAN related skbs this patch
makes sure that received CAN skbs always have a proper timestamp set.
Maybe there's a better solution in the future but this patch fixes the
CAN frame loss so far.
Reported-by: Manfred Schlaegl <manfred.schlaegl@gmx.at>
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
Cc: linux-stable <stable@vger.kernel.org>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'net')
| -rw-r--r-- | net/can/af_can.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/net/can/af_can.c b/net/can/af_can.c index 32d710e..689c818 100644 --- a/net/can/af_can.c +++ b/net/can/af_can.c @@ -310,8 +310,12 @@ int can_send(struct sk_buff *skb, int loop) return err; } - if (newskb) + if (newskb) { + if (!(newskb->tstamp.tv64)) + __net_timestamp(newskb); + netif_rx_ni(newskb); + } /* update statistics */ can_stats.tx_frames++; |
