summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Gatzka <stephan@gatzka.org>2012-06-02 03:04:06 +0000
committerDavid S. Miller <davem@davemloft.net>2012-06-02 17:09:08 -0400
commit9ca3cc6f3026946ba655e863ca2096339e667639 (patch)
treef66809188bccedc886de82dbcf05a67a637a7332
parentb1ff4f96fd1c63890d78d8939c6e0f2b44ce3113 (diff)
downloadconfigs-9ca3cc6f3026946ba655e863ca2096339e667639.tar.gz
fec_mpc52xx: fix timestamp filtering
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> Acked-by: Richard Cochran <richardcochran@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/freescale/fec_mpc52xx.c2
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 97f947b3d94..2933d08b036 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);