All of lore.kernel.org
 help / color / mirror / Atom feed
From: Martin Schiller <ms@dev.tdt.de>
To: andrew.hendry@gmail.com, davem@davemloft.net, kuba@kernel.org,
	xie.he.0141@gmail.com
Cc: linux-x25@vger.kernel.org, netdev@vger.kernel.org,
	linux-kernel@vger.kernel.org, Martin Schiller <ms@dev.tdt.de>
Subject: [PATCH net-next v3 2/6] net/lapb: fix lapb_connect_request() for DCE
Date: Wed, 18 Nov 2020 14:59:15 +0100	[thread overview]
Message-ID: <20201118135919.1447-3-ms@dev.tdt.de> (raw)
In-Reply-To: <20201118135919.1447-1-ms@dev.tdt.de>

For a DTE interface we should change to state LAPB_STATE_1 and start
sending SABM(E). But for DCE interfaces, we simply should start the
timer t1.

Signed-off-by: Martin Schiller <ms@dev.tdt.de>
---
 net/lapb/lapb_iface.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/net/lapb/lapb_iface.c b/net/lapb/lapb_iface.c
index 3c03f6512c5f..8dd7c420ae93 100644
--- a/net/lapb/lapb_iface.c
+++ b/net/lapb/lapb_iface.c
@@ -278,10 +278,14 @@ int lapb_connect_request(struct net_device *dev)
 	if (lapb->state == LAPB_STATE_3 || lapb->state == LAPB_STATE_4)
 		goto out_put;
 
-	lapb_establish_data_link(lapb);
+	if (lapb->mode & LAPB_DCE) {
+		lapb_start_t1timer(lapb);
+	} else {
+		lapb_establish_data_link(lapb);
 
-	lapb_dbg(0, "(%p) S0 -> S1\n", lapb->dev);
-	lapb->state = LAPB_STATE_1;
+		lapb_dbg(0, "(%p) S0 -> S1\n", lapb->dev);
+		lapb->state = LAPB_STATE_1;
+	}
 
 	rc = LAPB_OK;
 out_put:
-- 
2.20.1


  parent reply	other threads:[~2020-11-18 14:00 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-18 13:59 [PATCH net-next v3 0/6] net/x25: netdev event handling Martin Schiller
2020-11-18 13:59 ` [PATCH net-next v3 1/6] net/x25: handle additional netdev events Martin Schiller
2020-11-18 13:59 ` Martin Schiller [this message]
2020-11-18 13:59 ` [PATCH net-next v3 3/6] net/lapb: handle carrier loss correctly Martin Schiller
2020-11-18 13:59 ` [PATCH net-next v3 4/6] net/lapb: fix t1 timer handling for DCE Martin Schiller
2020-11-18 13:59 ` [PATCH net-next v3 5/6] net/x25: fix restart request/confirm handling Martin Schiller
2020-11-18 13:59 ` [PATCH net-next v3 6/6] net/x25: remove x25_kill_by_device() Martin Schiller
2020-11-18 14:47 ` [PATCH net-next v3 0/6] net/x25: netdev event handling Xie He
2020-11-19  7:02   ` Martin Schiller
2020-11-19  8:09     ` Xie He

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201118135919.1447-3-ms@dev.tdt.de \
    --to=ms@dev.tdt.de \
    --cc=andrew.hendry@gmail.com \
    --cc=davem@davemloft.net \
    --cc=kuba@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-x25@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=xie.he.0141@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.