From 45026d43f6cfbe0f6efa446b47629cb948db5a9d Mon Sep 17 00:00:00 2001
From: Kozlov Dmitry <dima@server>
Date: Thu, 15 Nov 2012 14:21:35 +0400
Subject: merge upstream

---
 accel-pppd/ctrl/l2tp/l2tp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'accel-pppd/ctrl/l2tp/l2tp.c')

diff --git a/accel-pppd/ctrl/l2tp/l2tp.c b/accel-pppd/ctrl/l2tp/l2tp.c
index 7fb00ef..071a782 100644
--- a/accel-pppd/ctrl/l2tp/l2tp.c
+++ b/accel-pppd/ctrl/l2tp/l2tp.c
@@ -1318,7 +1318,7 @@ static int l2tp_conn_read(struct triton_md_handler_t *h)
 				log_debug("duplicate packet %i\n", ntohs(pack->hdr.Ns));
 				if (!list_empty(&conn->send_queue))
 					l2tp_retransmit(conn);
-				if (l2tp_send_ZLB(conn))
+				else if (l2tp_send_ZLB(conn))
 					goto drop;
 			} else {
 				l2tp_conn_log(log_debug, conn);
-- 
cgit v1.2.3