| Date | Thu, 07 Jun 2012 13:04:16 +0900 | From | Greg KH <> | Subject | [ 40/82] fec_mpc52xx: fix timestamp filtering |
| |
3.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stephan Gatzka <stephan@gatzka.org>
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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
--- 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_interr 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);
|