Commit 937956ba authored by Taehee Yoo's avatar Taehee Yoo Committed by Jakub Kicinski
Browse files

amt: fix gateway mode stuck 



If a gateway can not receive any response to requests from a relay,
gateway resets status from SENT_REQUEST to INIT and variable about a
relay as well. And then it should start the full establish step
from sending a discovery message and receiving advertisement message.
But, after failure in amt_req_work() it continues sending a request
message step with flushed(invalid) relay information and sets SENT_REQUEST.
So, a gateway can't be established with a relay.
In order to avoid this situation, it stops sending the request message
step if it fails.

Fixes: cbc21dc1 ("amt: add data plane of amt interface")
Signed-off-by: default avatarTaehee Yoo <ap420073@gmail.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent fe5c5fc1

drivers/net/amt.c

+4 −2
Original line number Diff line number Diff line
@@ -943,7 +943,7 @@ static void amt_req_work(struct work_struct *work) 
	if (amt->status < AMT_STATUS_RECEIVED_ADVERTISEMENT)

		goto out;



	if (amt->req_cnt++ > AMT_MAX_REQ_COUNT) {

	if (amt->req_cnt > AMT_MAX_REQ_COUNT) {

		netdev_dbg(amt->dev, "Gateway is not ready");

		amt->qi = AMT_INIT_REQ_TIMEOUT;

		amt->ready4 = false;
@@ -951,13 +951,15 @@ static void amt_req_work(struct work_struct *work) 
		amt->remote_ip = 0;

		__amt_update_gw_status(amt, AMT_STATUS_INIT, false);

		amt->req_cnt = 0;

		goto out;

	}

	spin_unlock_bh(&amt->lock);



	amt_send_request(amt, false);

	amt_send_request(amt, true);

	amt_update_gw_status(amt, AMT_STATUS_SENT_REQUEST, true);

	spin_lock_bh(&amt->lock);

	__amt_update_gw_status(amt, AMT_STATUS_SENT_REQUEST, true);

	amt->req_cnt++;

out:

	exp = min_t(u32, (1 * (1 << amt->req_cnt)), AMT_MAX_REQ_TIMEOUT);

	mod_delayed_work(amt_wq, &amt->req_wq, msecs_to_jiffies(exp * 1000));