From 6826688777753a562872cb98da4ef1a5a4e9747d Mon Sep 17 00:00:00 2001
From: skarg <skarg@1e814d3a-8a88-4260-be86-c0dc25669c1e>
Date: Fri, 24 Sep 2010 19:37:43 +0000
Subject: [PATCH] Fixed merge problem.

---
 bacnet-stack/ports/at91sam7s/dlmstp.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/bacnet-stack/ports/at91sam7s/dlmstp.c b/bacnet-stack/ports/at91sam7s/dlmstp.c
index bda92fbe..45e93a03 100644
--- a/bacnet-stack/ports/at91sam7s/dlmstp.c
+++ b/bacnet-stack/ports/at91sam7s/dlmstp.c
@@ -622,9 +622,6 @@ static void MSTP_Receive_Frame_FSM(
                         MSTP_Flag.ReceivedInvalidFrame = true;
                     }
                     Receive_State = MSTP_RECEIVE_STATE_IDLE;
-                } else {
-                    MSTP_Flag.ReceivedInvalidFrame = true;
-                    Receive_State = MSTP_RECEIVE_STATE_IDLE;
                 }
             }
             break;