tipc: Remove per-connection sequence number logic

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>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/tipc/port.c b/net/tipc/port.c
index 0737680e9266021f528f5addec9ff0acefbec406..ebcbc21d8f9827c525e85b4ea8636a2101091e3b 100644 (file)
--- 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;