From: Paul Gortmaker <paul.gortmaker@windriver.com>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, allan.stephens@windriver.com
Subject: [PATCH net-next 09/14] tipc: Remove per-connection sequence number logic
Date: Tue, 17 Aug 2010 17:00:11 -0400 [thread overview]
Message-ID: <1282078816-11844-10-git-send-email-paul.gortmaker@windriver.com> (raw)
In-Reply-To: <1282078816-11844-1-git-send-email-paul.gortmaker@windriver.com>
From: Allan Stephens <allan.stephens@windriver.com>
Remove validation of the per-connection sequence numbers on routable
connections, since routable connections are not supported by TIPC.
Signed-off-by: Allan Stephens <allan.stephens@windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
net/tipc/port.c | 15 +++------------
1 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/net/tipc/port.c b/net/tipc/port.c
index 0737680..ebcbc21 100644
--- a/net/tipc/port.c
+++ b/net/tipc/port.c
@@ -588,19 +588,10 @@ void tipc_port_recv_proto_msg(struct sk_buff *buf)
if (!p_ptr) {
err = TIPC_ERR_NO_PORT;
} else if (p_ptr->publ.connected) {
- if (port_peernode(p_ptr) != msg_orignode(msg))
+ if ((port_peernode(p_ptr) != msg_orignode(msg)) ||
+ (port_peerport(p_ptr) != msg_origport(msg))) {
err = TIPC_ERR_NO_PORT;
- if (port_peerport(p_ptr) != msg_origport(msg))
- err = TIPC_ERR_NO_PORT;
- if (!err && msg_routed(msg)) {
- u32 seqno = msg_transp_seqno(msg);
- u32 myno = ++p_ptr->last_in_seqno;
- if (seqno != myno) {
- err = TIPC_ERR_NO_PORT;
- abort_buf = port_build_self_abort_msg(p_ptr, err);
- }
- }
- if (msg_type(msg) == CONN_ACK) {
+ } else if (msg_type(msg) == CONN_ACK) {
int wakeup = tipc_port_congested(p_ptr) &&
p_ptr->publ.congested &&
p_ptr->wakeup;
--
1.7.2.1
next prev parent reply other threads:[~2010-08-17 21:00 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-17 21:00 [PATCH 0/14 net-next] more TIPC fixes and updates Paul Gortmaker
2010-08-17 21:00 ` [PATCH net-next 01/14] tipc: Fix log buffer memory leak if initialization fails Paul Gortmaker
2010-08-17 21:00 ` [PATCH net-next 02/14] tipc: add SO_RCVLOWAT support to stream socket receive path Paul Gortmaker
2010-08-17 21:00 ` [PATCH net-next 03/14] tipc: Provide correct error code for unsupported connect() operation Paul Gortmaker
2010-08-17 21:00 ` [PATCH net-next 04/14] tipc: correct problems with misleading flags returned using poll() Paul Gortmaker
2010-08-17 21:00 ` [PATCH net-next 05/14] tipc: Check for disabled bearer when processing incoming messages Paul Gortmaker
2010-08-17 21:00 ` [PATCH net-next 06/14] tipc: Prevent crash when broadcast link cannot send to all nodes Paul Gortmaker
2010-08-17 21:00 ` [PATCH net-next 07/14] tipc: Fix premature broadcast advertisement by sending node Paul Gortmaker
2010-08-17 21:00 ` [PATCH net-next 08/14] tipc: Fix bug in broadcast link transmit statistics computation Paul Gortmaker
2010-08-17 21:00 ` Paul Gortmaker [this message]
2010-08-17 21:00 ` [PATCH net-next 10/14] tipc: Optimize tipc_node_has_active_links() Paul Gortmaker
2010-08-17 21:00 ` [PATCH net-next 11/14] tipc: Eliminate useless linked list initialization Paul Gortmaker
2010-08-18 0:29 ` David Miller
2010-08-18 13:28 ` Paul Gortmaker
2010-08-17 21:00 ` [PATCH net-next 12/14] tipc: Minor enhancements to name table display format Paul Gortmaker
2010-08-17 21:00 ` [PATCH net-next 13/14] tipc: Allow connect() to wait indefinitely Paul Gortmaker
2010-08-17 21:00 ` [PATCH net-next 14/14] tipc: Prevent missing name table entries when link flip-flops rapidly Paul Gortmaker
2010-08-18 0:33 ` [PATCH 0/14 net-next] more TIPC fixes and updates David Miller
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=1282078816-11844-10-git-send-email-paul.gortmaker@windriver.com \
--to=paul.gortmaker@windriver.com \
--cc=allan.stephens@windriver.com \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
/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).