Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / net / dsa / tag_trailer.c

diff --git a/net/dsa/tag_trailer.c b/net/dsa/tag_trailer.c
index efd26697e716a22b6fb8713a5285b88a20fab2ab..b59132878ad1c45ce54271213d5b4909d5113809 100644 (file)
--- a/net/dsa/tag_trailer.c
+++ b/net/dsa/tag_trailer.c
@@ -98,7 +98,6 @@ static int trailer_rcv(struct sk_buff *skb, struct net_device *dev,
        skb->pkt_type = PACKET_HOST;
        skb->protocol = eth_type_trans(skb, skb->dev);
 
-       skb->dev->last_rx = jiffies;
        skb->dev->stats.rx_packets++;
        skb->dev->stats.rx_bytes += skb->len;