diff options
| author |   Enrico Weigelt <info@metux.net> | 2019-07-29 20:55:21 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-07-29 13:57:58 -0700 |
| commit | d4e575ba9fcc04d10c0a2e555a5b32fa3a8a19d3 (patch) | |
| tree | 534cdc4d3fd2111277d589fce415ed87c1755176 /net/sctp/socket.c | |
| parent | mlxsw: spectrum_ptp: Increase parsing depth when PTP is enabled (diff) | |
| download | linux-dev-d4e575ba9fcc04d10c0a2e555a5b32fa3a8a19d3.tar.xz linux-dev-d4e575ba9fcc04d10c0a2e555a5b32fa3a8a19d3.zip | |
net: sctp: drop unneeded likely() call around IS_ERR()
IS_ERR() already calls unlikely(), so this extra unlikely() call
around IS_ERR() is not needed.
Signed-off-by: Enrico Weigelt <info@metux.net>
Acked-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | net/sctp/socket.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sctp/socket.c b/net/sctp/socket.c index aa80cda36581..9d1f83b10c0a 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -985,7 +985,7 @@ static int sctp_setsockopt_bindx(struct sock *sk, return -EINVAL; kaddrs = memdup_user(addrs, addrs_size); - if (unlikely(IS_ERR(kaddrs))) + if (IS_ERR(kaddrs)) return PTR_ERR(kaddrs); /* Walk through the addrs buffer and count the number of addresses. */ @@ -1315,7 +1315,7 @@ static int __sctp_setsockopt_connectx(struct sock *sk, return -EINVAL; kaddrs = memdup_user(addrs, addrs_size); - if (unlikely(IS_ERR(kaddrs))) + if (IS_ERR(kaddrs)) return PTR_ERR(kaddrs); /* Allow security module to validate connectx addresses. */ |