diff --git a/src/capwap/conn.c b/src/capwap/conn.c
index 9fa687da..c7f0328d 100644
--- a/src/capwap/conn.c
+++ b/src/capwap/conn.c
@@ -33,6 +33,7 @@ void conn_init(struct conn * conn)
 	conn->max_retransmit=CAPWAP_MAX_RETRANSMIT;
 	conn->wait_dtls=CAPWAP_WAIT_DTLS;
 	conn->wait_join=CAPWAP_WAIT_JOIN;
+	conn->mtu_discovery=1;
 }
 
 
diff --git a/src/capwap/conn.h b/src/capwap/conn.h
index 80baa9cb..ba296046 100644
--- a/src/capwap/conn.h
+++ b/src/capwap/conn.h
@@ -62,8 +62,9 @@ struct conn{
 	uint8_t req_buffer[65536];
 	uint8_t resp_buffer[65536];
 
-
-	int mtu;
+	
+	int mtu;		/* max mtu, could be changed during discovery */
+	int mtu_discovery;	/* 0 mtu discovery turned off, 1 discovery tuned on */
 
 	/* receive and send methods */