From 780136397760cdac13eaf6dc3273bb2dbfe415e6 Mon Sep 17 00:00:00 2001 From: Faisal Latif Date: Mon, 27 Apr 2009 13:38:31 -0700 Subject: [PATCH] --- yaml --- r: 144295 b: refs/heads/master c: c11470f9f4d4490cd7e9563f604c4c7868caf6de h: refs/heads/master i: 144293: 8077b1df7653265f07166a7b282b230c4f421b76 144291: ab9462b1b21a77a20a7a1806c275e58f8cef765b 144287: 1484827d60017f5aad7c94254342a3dc5cc5a7e7 v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/hw/nes/nes_cm.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 25bd7814da18..56b0e1db900d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 53094c388f11d79f742eaf743c9fd740a881f2c0 +refs/heads/master: c11470f9f4d4490cd7e9563f604c4c7868caf6de diff --git a/trunk/drivers/infiniband/hw/nes/nes_cm.c b/trunk/drivers/infiniband/hw/nes/nes_cm.c index 1efe0beca063..1f7a659e6e9a 100644 --- a/trunk/drivers/infiniband/hw/nes/nes_cm.c +++ b/trunk/drivers/infiniband/hw/nes/nes_cm.c @@ -56,6 +56,7 @@ #include #include #include +#include #include "nes.h" @@ -1514,7 +1515,7 @@ static int check_seq(struct nes_cm_node *cm_node, struct tcphdr *tcph, rcv_wnd = cm_node->tcp_cntxt.rcv_wnd; if (ack_seq != loc_seq_num) err = 1; - else if ((seq + rcv_wnd) < rcv_nxt) + else if (!between(seq, rcv_nxt, (rcv_nxt+rcv_wnd))) err = 1; if (err) { nes_debug(NES_DBG_CM, "%s[%u] create abort for cm_node=%p "