From: Jakub Kicinski <jakub.kicinski@netronome.com>
Date: Mon, 7 Oct 2019 04:09:28 +0000 (-0700)
Subject: net/tls: mark sk->err being set as unlikely
X-Git-Tag: for-linus-20191129~13^2~397^2~4
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=93277b258f47554f3057db49b191ea5096ce8dbd;p=linux-2.6-block.git

net/tls: mark sk->err being set as unlikely

Tell GCC sk->err is not likely to be set.

Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Dirk van der Merwe <dirk.vandermerwe@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/tls/tls_device.c b/net/tls/tls_device.c
index f306e4c7bf15..fcf38edc07d6 100644
--- a/net/tls/tls_device.c
+++ b/net/tls/tls_device.c
@@ -431,7 +431,7 @@ static int tls_push_data(struct sock *sk,
 	    ~(MSG_MORE | MSG_DONTWAIT | MSG_NOSIGNAL | MSG_SENDPAGE_NOTLAST))
 		return -ENOTSUPP;
 
-	if (sk->sk_err)
+	if (unlikely(sk->sk_err))
 		return -sk->sk_err;
 
 	flags |= MSG_SENDPAGE_DECRYPTED;