diff mbox

[net-next-2.6,v9,20/20] pch_can: Replace netif_rx to netif_receive_skb

Message ID 1292221467-8039-20-git-send-email-tomoya-linux@dsn.okisemi.com
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Tomoya Dec. 13, 2010, 6:24 a.m. UTC 
Since this driver is implemented as NAPI,
netif_receive_skb must be used not netif_rx.

Signed-off-by: Tomoya MORINAGA <tomoya-linux@dsn.okisemi.com>
Acked-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
 drivers/net/can/pch_can.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Comments

David Miller Dec. 13, 2010, 8:28 p.m. UTC | #1 
From: Tomoya MORINAGA <tomoya-linux@dsn.okisemi.com>
Date: Mon, 13 Dec 2010 15:24:26 +0900

> Since this driver is implemented as NAPI,
> netif_receive_skb must be used not netif_rx.
> 
> Signed-off-by: Tomoya MORINAGA <tomoya-linux@dsn.okisemi.com>
> Acked-by: Marc Kleine-Budde <mkl@pengutronix.de>

Applied.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Oliver Hartkopp Dec. 13, 2010, 9:51 p.m. UTC | #2 
On 13.12.2010 21:28, David Miller wrote:
> From: Tomoya MORINAGA <tomoya-linux@dsn.okisemi.com>
> Date: Mon, 13 Dec 2010 15:24:26 +0900
> 
>> Since this driver is implemented as NAPI,
>> netif_receive_skb must be used not netif_rx.
>>
>> Signed-off-by: Tomoya MORINAGA <tomoya-linux@dsn.okisemi.com>
>> Acked-by: Marc Kleine-Budde <mkl@pengutronix.de>
> 
> Applied.

Do you plan to push this huge patchset to Linus' 2.6.37-rc5 tree?

I wonder if the pch_can driver in linux-2.6 tree is already usable without
these latest patches that have been applied only to net-next-2.6.

Regards,
Oliver


--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Tomoya Dec. 14, 2010, 2:16 a.m. UTC | #3 
Hi David,

Thank you for your acceptance.

> Hi Marc and Wolfgang
Until now, thank you for your much help!

---
Tomoya MORINAGA
OKI SEMICONDUCTOR CO., LTD.

----- Original Message ----- 
From: "David Miller" <davem@davemloft.net>
To: <tomoya-linux@dsn.okisemi.com>
Cc: <wg@grandegger.com>; <w.sang@pengutronix.de>; <chripell@fsfe.org>; 
<21cnbao@gmail.com>; <sameo@linux.intel.com>; 
<socketcan-core@lists.berlios.de>; <netdev@vger.kernel.org>; 
<linux-kernel@vger.kernel.org>; <qi.wang@intel.com>; 
<yong.y.wang@intel.com>; <andrew.chih.howe.khor@intel.com>; 
<joel.clark@intel.com>; <kok.howg.ewe@intel.com>; <margie.foster@intel.com>
Sent: Tuesday, December 14, 2010 5:28 AM
Subject: Re: [PATCH net-next-2.6 v9 20/20] pch_can: Replace netif_rx to 
netif_receive_skb


> From: Tomoya MORINAGA <tomoya-linux@dsn.okisemi.com>
> Date: Mon, 13 Dec 2010 15:24:26 +0900
>
>> Since this driver is implemented as NAPI,
>> netif_receive_skb must be used not netif_rx.
>>
>> Signed-off-by: Tomoya MORINAGA <tomoya-linux@dsn.okisemi.com>
>> Acked-by: Marc Kleine-Budde <mkl@pengutronix.de>
>
> Applied.
> 

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller Dec. 14, 2010, 3:45 a.m. UTC | #4 
From: Oliver Hartkopp <socketcan@hartkopp.net>
Date: Mon, 13 Dec 2010 22:51:32 +0100

> On 13.12.2010 21:28, David Miller wrote:
>> From: Tomoya MORINAGA <tomoya-linux@dsn.okisemi.com>
>> Date: Mon, 13 Dec 2010 15:24:26 +0900
>> 
>>> Since this driver is implemented as NAPI,
>>> netif_receive_skb must be used not netif_rx.
>>>
>>> Signed-off-by: Tomoya MORINAGA <tomoya-linux@dsn.okisemi.com>
>>> Acked-by: Marc Kleine-Budde <mkl@pengutronix.de>
>> 
>> Applied.
> 
> Do you plan to push this huge patchset to Linus' 2.6.37-rc5 tree?
> 
> I wonder if the pch_can driver in linux-2.6 tree is already usable without
> these latest patches that have been applied only to net-next-2.6.

I'm happy to take the changes for a backport once all of this settles
down which I don't believe it has yet.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/net/can/pch_can.c b/drivers/net/can/pch_can.c
index 4697b1c..8d45fdd 100644
--- a/drivers/net/can/pch_can.c
+++ b/drivers/net/can/pch_can.c
@@ -572,7 +572,7 @@  static void pch_can_error(struct net_device *ndev, u32 status)
 	cf->data[7] = (errc & PCH_REC) >> 8;
 
 	priv->can.state = state;
-	netif_rx(skb);
+	netif_receive_skb(skb);
 
 	stats->rx_packets++;
 	stats->rx_bytes += cf->can_dlc;