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 v2 6/6] net/lapb: fix t1 timer handling
Date: Mon, 16 Nov 2020 14:55:28 +0100 [thread overview]
Message-ID: <20201116135522.21791-7-ms@dev.tdt.de> (raw)
In-Reply-To: <20201116135522.21791-1-ms@dev.tdt.de>
fix t1 timer handling in LAPB_STATE_0:
o DTE interface changes immediately to LAPB_STATE_1 and start sending
SABM(E).
o DCE interface sends N2-times DM and changes to LAPB_STATE_1
afterwards if there is no response in the meantime.
Signed-off-by: Martin Schiller <ms@dev.tdt.de>
---
Change from v1:
fix 'subject_prefix' and 'checkpatch' warnings
---
net/lapb/lapb_timer.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/net/lapb/lapb_timer.c b/net/lapb/lapb_timer.c
index 8f5b17001a07..baa247fe4ed0 100644
--- a/net/lapb/lapb_timer.c
+++ b/net/lapb/lapb_timer.c
@@ -85,11 +85,18 @@ static void lapb_t1timer_expiry(struct timer_list *t)
switch (lapb->state) {
/*
- * If we are a DCE, keep going DM .. DM .. DM
+ * If we are a DCE, send DM up to N2 times, then switch to
+ * STATE_1 and send SABM(E).
*/
case LAPB_STATE_0:
- if (lapb->mode & LAPB_DCE)
+ if (lapb->mode & LAPB_DCE &&
+ lapb->n2count != lapb->n2) {
+ lapb->n2count++;
lapb_send_control(lapb, LAPB_DM, LAPB_POLLOFF, LAPB_RESPONSE);
+ } else {
+ lapb->state = LAPB_STATE_1;
+ lapb_establish_data_link(lapb);
+ }
break;
/*
--
2.20.1
prev parent reply other threads:[~2020-11-16 14:02 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-16 13:55 [PATCH net-next v2 0/6] netdev event handling + neighbour config Martin Schiller
2020-11-16 13:55 ` [PATCH net-next v2 1/6] net/x25: handle additional netdev events Martin Schiller
2020-11-16 13:55 ` [PATCH net-next v2 2/6] net/x25: make neighbour params configurable Martin Schiller
2020-11-16 17:05 ` David Laight
2020-11-16 13:55 ` [PATCH net-next v2 3/6] net/x25: replace x25_kill_by_device with x25_kill_by_neigh Martin Schiller
2020-11-17 19:50 ` Xie He
2020-11-18 8:28 ` Martin Schiller
2020-11-16 13:55 ` [PATCH net-next v2 4/6] net/x25: support NETDEV_CHANGE notifier Martin Schiller
2020-11-17 11:41 ` Xie He
2020-11-17 12:30 ` Martin Schiller
2020-11-16 13:55 ` [PATCH net-next v2 5/6] net/lapb: support netdev events Martin Schiller
2020-11-16 20:16 ` Xie He
2020-11-17 9:52 ` Martin Schiller
2020-11-17 11:32 ` Xie He
2020-11-17 13:26 ` Martin Schiller
2020-11-17 18:28 ` Xie He
2020-11-18 8:49 ` Martin Schiller
2020-11-18 13:03 ` Xie He
2020-11-18 13:46 ` Xie He
2020-11-18 13:57 ` Martin Schiller
2020-11-16 13:55 ` Martin Schiller [this message]
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=20201116135522.21791-7-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).