Patchwork net: fix typo in freescale/ucc_geth.c

login
register
mail settings
Submitter Michael Neuling
Date Oct. 8, 2012, 11:52 p.m.
Message ID <23452.1349740345@neuling.org>
Download mbox | patch
Permalink /patch/190166/
State Not Applicable
Headers show

Comments

Michael Neuling - Oct. 8, 2012, 11:52 p.m.
The following patch: 
  acb600d net: remove skb recycling
added dev_free_skb() to drivers/net/ethernet/freescale/ucc_geth.c

This is a typo and should be dev_kfree_skb().  This fixes this.

Signed-off-by: Michael Neuling <mikey@neuling.org>
---
This hit as a compile error in next-20121008 with mpc85xx_defconfig.
David Miller - Oct. 9, 2012, 4:21 a.m.
From: Michael Neuling <mikey@neuling.org>
Date: Tue, 09 Oct 2012 10:52:25 +1100

> The following patch: 
>   acb600d net: remove skb recycling
> added dev_free_skb() to drivers/net/ethernet/freescale/ucc_geth.c
> 
> This is a typo and should be dev_kfree_skb().  This fixes this.
> 
> Signed-off-by: Michael Neuling <mikey@neuling.org>

Applied, thanks a lot.
Eric Dumazet - Oct. 9, 2012, 6:04 a.m.
On Tue, 2012-10-09 at 10:52 +1100, Michael Neuling wrote:
> The following patch: 
>   acb600d net: remove skb recycling
> added dev_free_skb() to drivers/net/ethernet/freescale/ucc_geth.c
> 
> This is a typo and should be dev_kfree_skb().  This fixes this.
> 
> Signed-off-by: Michael Neuling <mikey@neuling.org>
> ---
> This hit as a compile error in next-20121008 with mpc85xx_defconfig.
> 
> diff --git a/drivers/net/ethernet/freescale/ucc_geth.c b/drivers/net/ethernet/freescale/ucc_geth.c
> index dfa0aaa..0a70bb5 100644
> --- a/drivers/net/ethernet/freescale/ucc_geth.c
> +++ b/drivers/net/ethernet/freescale/ucc_geth.c
> @@ -3268,7 +3268,7 @@ static int ucc_geth_rx(struct ucc_geth_private *ugeth, u8 rxQ, int rx_work_limit
>  			if (netif_msg_rx_err(ugeth))
>  				ugeth_err("%s, %d: ERROR!!! skb - 0x%08x",
>  					   __func__, __LINE__, (u32) skb);
> -			dev_free_skb(skb);
> +			dev_kfree_skb(skb);
>  
>  			ugeth->rx_skbuff[rxQ][ugeth->skb_currx[rxQ]] = NULL;
>  

Oops, thanks Michael !

Patch

diff --git a/drivers/net/ethernet/freescale/ucc_geth.c b/drivers/net/ethernet/freescale/ucc_geth.c
index dfa0aaa..0a70bb5 100644
--- a/drivers/net/ethernet/freescale/ucc_geth.c
+++ b/drivers/net/ethernet/freescale/ucc_geth.c
@@ -3268,7 +3268,7 @@  static int ucc_geth_rx(struct ucc_geth_private *ugeth, u8 rxQ, int rx_work_limit
 			if (netif_msg_rx_err(ugeth))
 				ugeth_err("%s, %d: ERROR!!! skb - 0x%08x",
 					   __func__, __LINE__, (u32) skb);
-			dev_free_skb(skb);
+			dev_kfree_skb(skb);
 
 			ugeth->rx_skbuff[rxQ][ugeth->skb_currx[rxQ]] = NULL;
 			dev->stats.rx_dropped++;