diff options
author | Stephan Gatzka <stephan@gatzka.org> | 2012-06-02 03:04:06 +0000 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-10 00:36:12 +0900 |
commit | fd62fa971584007e612be6e531101842de97715a (patch) | |
tree | ab1b70e87f4e3094b24bf3d1750b163741b686a6 /drivers | |
parent | c8c0b91569f01d7713c843245c538b51f733646a (diff) | |
download | linux-3.10-fd62fa971584007e612be6e531101842de97715a.tar.gz linux-3.10-fd62fa971584007e612be6e531101842de97715a.tar.bz2 linux-3.10-fd62fa971584007e612be6e531101842de97715a.zip |
fec_mpc52xx: fix timestamp filtering
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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/ethernet/freescale/fec_mpc52xx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/freescale/fec_mpc52xx.c b/drivers/net/ethernet/freescale/fec_mpc52xx.c index 7b34d8c698d..fc87e8933ce 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); |