netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/1] fec_mpc52xx: fix timestamp filtering
@ 2012-06-02 13:04 Stephan Gatzka
  2012-06-02 19:06 ` Richard Cochran
  0 siblings, 1 reply; 3+ messages in thread
From: Stephan Gatzka @ 2012-06-02 13:04 UTC (permalink / raw)
  To: netdev, davem, richardcochran; +Cc: Stephan Gatzka, stable

skb_defer_rx_timestamp was called with a freshly allocated skb but must
be called with rskb instead.

Signed-off-by: Stephan Gatzka <stephan@gatzka.org>
Cc: stable <stable@vger.kernel.org>
---
 drivers/net/ethernet/freescale/fec_mpc52xx.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/freescale/fec_mpc52xx.c b/drivers/net/ethernet/freescale/fec_mpc52xx.c
index 97f947b..2933d08 100644
--- a/drivers/net/ethernet/freescale/fec_mpc52xx.c
+++ b/drivers/net/ethernet/freescale/fec_mpc52xx.c
@@ -437,7 +437,7 @@ static irqreturn_t mpc52xx_fec_rx_interrupt(int irq, void *dev_id)
 		length = status & BCOM_FEC_RX_BD_LEN_MASK;
 		skb_put(rskb, length - 4);	/* length without CRC32 */
 		rskb->protocol = eth_type_trans(rskb, dev);
-		if (!skb_defer_rx_timestamp(skb))
+		if (!skb_defer_rx_timestamp(rskb))
 			netif_rx(rskb);
 
 		spin_lock(&priv->lock);
-- 
1.7.9.5

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH 1/1] fec_mpc52xx: fix timestamp filtering
  2012-06-02 13:04 [PATCH 1/1] fec_mpc52xx: fix timestamp filtering Stephan Gatzka
@ 2012-06-02 19:06 ` Richard Cochran
  2012-06-02 21:09   ` David Miller
  0 siblings, 1 reply; 3+ messages in thread
From: Richard Cochran @ 2012-06-02 19:06 UTC (permalink / raw)
  To: Stephan Gatzka; +Cc: netdev, davem, stable

On Sat, Jun 02, 2012 at 03:04:06PM +0200, Stephan Gatzka wrote:
> skb_defer_rx_timestamp was called with a freshly allocated skb but must
> be called with rskb instead.

Thanks for checking this, and sorry for the trouble it caused you.

Acked-by: Richard Cochran <richardcochran@gmail.com>

> 
> Signed-off-by: Stephan Gatzka <stephan@gatzka.org>
> Cc: stable <stable@vger.kernel.org>
> ---
>  drivers/net/ethernet/freescale/fec_mpc52xx.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/net/ethernet/freescale/fec_mpc52xx.c b/drivers/net/ethernet/freescale/fec_mpc52xx.c
> index 97f947b..2933d08 100644
> --- a/drivers/net/ethernet/freescale/fec_mpc52xx.c
> +++ b/drivers/net/ethernet/freescale/fec_mpc52xx.c
> @@ -437,7 +437,7 @@ static irqreturn_t mpc52xx_fec_rx_interrupt(int irq, void *dev_id)
>  		length = status & BCOM_FEC_RX_BD_LEN_MASK;
>  		skb_put(rskb, length - 4);	/* length without CRC32 */
>  		rskb->protocol = eth_type_trans(rskb, dev);
> -		if (!skb_defer_rx_timestamp(skb))
> +		if (!skb_defer_rx_timestamp(rskb))
>  			netif_rx(rskb);
>  
>  		spin_lock(&priv->lock);
> -- 
> 1.7.9.5
> 

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH 1/1] fec_mpc52xx: fix timestamp filtering
  2012-06-02 19:06 ` Richard Cochran
@ 2012-06-02 21:09   ` David Miller
  0 siblings, 0 replies; 3+ messages in thread
From: David Miller @ 2012-06-02 21:09 UTC (permalink / raw)
  To: richardcochran; +Cc: stephan, netdev, stable

From: Richard Cochran <richardcochran@gmail.com>
Date: Sat, 2 Jun 2012 21:06:05 +0200

> On Sat, Jun 02, 2012 at 03:04:06PM +0200, Stephan Gatzka wrote:
>> skb_defer_rx_timestamp was called with a freshly allocated skb but must
>> be called with rskb instead.
> 
> Thanks for checking this, and sorry for the trouble it caused you.
> 
> Acked-by: Richard Cochran <richardcochran@gmail.com>

Applied.

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2012-06-02 21:09 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-06-02 13:04 [PATCH 1/1] fec_mpc52xx: fix timestamp filtering Stephan Gatzka
2012-06-02 19:06 ` Richard Cochran
2012-06-02 21:09   ` David Miller

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).