From: Arnaldo Carvalho de Melo <acme@kernel.org>
Date: Fri, 23 May 2014 19:55:12 +0000 (-0400)
Subject: tipc: Don't reset the timeout when restarting
X-Git-Tag: omap-for-v3.16/fixes-against-rc1~36^2~143
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=85d3fc9418dc5b357290de89b99c9a8bdd9eef89;p=pandora-kernel.git

tipc: Don't reset the timeout when restarting

As it may then take longer than what the user specified using
setsockopt(SO_RCVTIMEO).

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

Reading git-diff-tree failed