broken on next-next - [PATCH v6 4/8] can: replace can_dlc as variable/element for payload length

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi Marc,

I just rebased the len8_dlc patches on the latest net-next for testing.

And the patch a1e654070a60d5d4f ("can: dev: can_restart(): post buffer from the right context") renames netif_rx() to netif_rx_ni() which hinders this [PATCH v6 4/8] to apply properly.

Just FYI before you create a pull request for net-next ;-)

diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c
index 6dee4f8f2024..566501a02b91 100644
--- a/drivers/net/can/dev.c
+++ b/drivers/net/can/dev.c

(..)

@@ -593,11 +593,11 @@ static void can_restart(struct net_device *dev)
  	cf->can_id |= CAN_ERR_RESTARTED;
netif_rx(skb); stats->rx_packets++;
-	stats->rx_bytes += cf->can_dlc;
+	stats->rx_bytes += cf->len;

Best,
Oliver



[Index of Archives]     [Automotive Discussions]     [Linux ARM Kernel]     [Linux ARM]     [Linux Omap]     [Fedora ARM]     [IETF Annouce]     [Security]     [Bugtraq]     [Linux]     [Linux OMAP]     [Linux MIPS]     [eCos]     [Asterisk Internet PBX]     [Linux API]     [CAN Bus]

  Powered by Linux