]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
fec_mpc52xx: fix timestamp filtering
authorStephan Gatzka <stephan@gatzka.org>
Sat, 2 Jun 2012 03:04:06 +0000 (03:04 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 9 Jun 2012 15:36:12 +0000 (00:36 +0900)
commit 9ca3cc6f3026946ba655e863ca2096339e667639 upstream.

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>
Acked-by: Richard Cochran <richardcochran@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/net/ethernet/freescale/fec_mpc52xx.c

index 7b34d8c698dae663cd3ebf259e4918696b7c9585..fc87e8933cec4234082f910e58d4bd68facd8a92 100644 (file)
@@ -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);