From e9d2b9d58e1fbd9b92621825d186f1c1119e5190 Mon Sep 17 00:00:00 2001
From: Helmut Schaa <helmut.schaa@googlemail.com>
Date: Thu, 4 Nov 2010 20:38:56 +0100
Subject: [PATCH] --- yaml --- r: 224294 b: refs/heads/master c:
 e2f8c8752b994026fc0ddb4bb29ca229b3e0c104 h: refs/heads/master v: v3

---
 [refs]                                          | 2 +-
 trunk/drivers/net/wireless/rt2x00/rt2x00debug.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index a00f9bd6f41e..c2bd9a45fa09 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2b23cdaa3b0e9567597563e5a7a5103ecda447f0
+refs/heads/master: e2f8c8752b994026fc0ddb4bb29ca229b3e0c104
diff --git a/trunk/drivers/net/wireless/rt2x00/rt2x00debug.c b/trunk/drivers/net/wireless/rt2x00/rt2x00debug.c
index fcdb6b0dc40f..8296a9d47bbd 100644
--- a/trunk/drivers/net/wireless/rt2x00/rt2x00debug.c
+++ b/trunk/drivers/net/wireless/rt2x00/rt2x00debug.c
@@ -162,11 +162,11 @@ void rt2x00debug_dump_frame(struct rt2x00_dev *rt2x00dev,
 	struct timeval timestamp;
 	u32 data_len;
 
-	do_gettimeofday(&timestamp);
-
-	if (!test_bit(FRAME_DUMP_FILE_OPEN, &intf->frame_dump_flags))
+	if (likely(!test_bit(FRAME_DUMP_FILE_OPEN, &intf->frame_dump_flags)))
 		return;
 
+	do_gettimeofday(&timestamp);
+
 	if (skb_queue_len(&intf->frame_dump_skbqueue) > 20) {
 		DEBUG(rt2x00dev, "txrx dump queue length exceeded.\n");
 		return;