From 4d7fb7a54871fcbbb4f51e791599872907035a90 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Mon, 1 Nov 2010 11:39:05 -0400
Subject: [PATCH] --- yaml --- r: 227927 b: refs/heads/master c:
 e4d46254da76106e48b7cadc59fb410291e2da4b h: refs/heads/master i:   227925:
 7a5cf27de11b6e82458f5118ddad26490832162f   227923:
 791cd8fbcf2a797ae4f1c04a05035a0952a6d918   227919:
 34f0400dc827f5b6976af4804723d1e9f9da9a45 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/staging/bcm/CmHost.c | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 020545b28a11..63877a50a1fa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2d08748ae53bf07fe6fcaf4f3d40449b471ce351
+refs/heads/master: e4d46254da76106e48b7cadc59fb410291e2da4b
diff --git a/trunk/drivers/staging/bcm/CmHost.c b/trunk/drivers/staging/bcm/CmHost.c
index e19f7936d6f0..949aaa3b3191 100644
--- a/trunk/drivers/staging/bcm/CmHost.c
+++ b/trunk/drivers/staging/bcm/CmHost.c
@@ -2053,7 +2053,7 @@ BOOLEAN CmControlResponseMessage(PMINI_ADAPTER Adapter,  /**<Pointer to the Adap
 		case DSA_ACK:
 		{
 			UINT uiSearchRuleIndex=0;
-			struct timeval tv = {0};
+
 			BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "VCID:0x%X",
 				ntohs(pstAddIndication->u16VCID));
             uiSearchRuleIndex=SearchFreeSfid(Adapter);
@@ -2139,12 +2139,9 @@ BOOLEAN CmControlResponseMessage(PMINI_ADAPTER Adapter,  /**<Pointer to the Adap
 								Adapter->LinkUpStatus = 1;
 								if (netif_msg_link(Adapter))
 									pr_info(DRV_NAME "%s: link up\n", Adapter->dev->name);
-								do_gettimeofday(&tv);
-
 								atomic_set(&Adapter->TxPktAvail, 1);
 								wake_up(&Adapter->tx_packet_wait_queue);
-								Adapter->liTimeSinceLastNetEntry = tv.tv_sec;
-								BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "============Tx Service Flow Created!");
+								Adapter->liTimeSinceLastNetEntry = get_seconds();
 							}
 						}
 					}