aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Hutchings <ben@decadent.org.uk>2015-10-08 23:44:23 +0100
committerBen Hutchings <ben@decadent.org.uk>2015-10-13 03:46:13 +0100
commit77d4e6b99bd56ec158a96286af1d4b846446399b (patch)
tree737223404d14a2b501311df44c6b51a5ab0c39cd
parent78ad4aa10cd0ccaa4c940c0ac7f16de5f5e3c9ef (diff)
downloadkernel_samsung_smdk4412-77d4e6b99bd56ec158a96286af1d4b846446399b.zip
kernel_samsung_smdk4412-77d4e6b99bd56ec158a96286af1d4b846446399b.tar.gz
kernel_samsung_smdk4412-77d4e6b99bd56ec158a96286af1d4b846446399b.tar.bz2
Revert "sctp: Fix race between OOTB responce and route removal"
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@decadent.org.uk>
-rw-r--r--net/sctp/output.c4
1 files changed, 1 insertions, 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