[PATCH 3.2 107/107] Revert "sctp: Fix race between OOTB responce and route removal"

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



3.2.72-rc1 review patch.  If anyone has any objections, please let me know.

------------------

From: Ben Hutchings <ben@xxxxxxxxxxxxxxx>

This reverts commit 117b8a10fe0c434d9043267efd51f3ba3f3d359a, which
was commit 29c4afc4e98f4dc0ea9df22c631841f9c220b944 upstream.  The bug
it fixes upstream clearly doesn't exist in 3.2.

Signed-off-by: Ben Hutchings <ben@xxxxxxxxxxxxxxx>
---
 net/sctp/output.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/net/sctp/output.c b/net/sctp/output.c
index 6d56eec..c3b8549 100644
--- a/net/sctp/output.c
+++ b/net/sctp/output.c
@@ -587,9 +587,7 @@ out:
 	return err;
 no_route:
 	kfree_skb(nskb);
-
-	if (asoc)
-		IP_INC_STATS(&init_net, IPSTATS_MIB_OUTNOROUTES);
+	IP_INC_STATS(&init_net, IPSTATS_MIB_OUTNOROUTES);
 
 	/* FIXME: Returning the 'err' will effect all the associations
 	 * associated with a socket, although only one of the paths of the

--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Linux Kernel]     [Kernel Development Newbies]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite Hiking]     [Linux Kernel]     [Linux SCSI]