From: Octavian Purdila <octavian.purdila@intel.com>
Date: Wed, 25 Jun 2014 14:09:56 +0000 (+0300)
Subject: tcp: move around a few calls in tcp_v6_conn_request
X-Git-Tag: omap-for-v3.17/fixes-against-rc2~149^2~253^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9403715977075c89b1dbcdd7713ab542807a04ac;p=pandora-kernel.git

tcp: move around a few calls in tcp_v6_conn_request

Make the tcp_v6_conn_request calls flow similar with that of
tcp_v4_conn_request.

Note that want_cookie can be true only if isn is zero and that is why
we can move the if (want_cookie) block out of the if (!isn) block.

Moving security_inet_conn_request() has a couple of side effects:
missing inet_rsk(req)->ecn_ok update and the req->cookie_ts
update. However, neither SELinux nor Smack security hooks seems to
check them. This change should also avoid future different behaviour
for IPv4 and IPv6 in the security hooks.

Signed-off-by: Octavian Purdila <octavian.purdila@intel.com>
Acked-by: Paul Moore <paul@paul-moore.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

Reading git-diff-tree failed