summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwangweidong <wangweidong1@huawei.com>2013-12-11 16:42:14 +0800
committerDavid S. Miller <davem@davemloft.net>2013-12-11 15:39:34 -0500
commite47726683803616c773bc75c88cfb3eb54a8172b (patch)
treed0da5be3f278ed91223f6a7c4bfac30977fa686a
parent6b1dd8560179bd3328a3fb024ce1b63b772464fd (diff)
downloadlinux-e47726683803616c773bc75c88cfb3eb54a8172b.tar.bz2
sctp: remove redundant null check on asoc
In sctp_err_lookup, goto out while the asoc is not NULL, so remove the check NULL. Also, in sctp_err_finish which called by sctp_v4_err and sctp_v6_err, they pass asoc to sctp_err_finish while the asoc is not NULL, so remove the check. Signed-off-by: Wang Weidong <wangweidong1@huawei.com> Acked-by: Neil Horman <nhorman@tuxdriver.com> Acked-by: Vlad Yasevich <vyasevich@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/sctp/input.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/net/sctp/input.c b/net/sctp/input.c
index 66038533ca5c..2a192a7c5d81 100644
--- a/net/sctp/input.c
+++ b/net/sctp/input.c
@@ -536,8 +536,7 @@ struct sock *sctp_err_lookup(struct net *net, int family, struct sk_buff *skb,
return sk;
out:
- if (asoc)
- sctp_association_put(asoc);
+ sctp_association_put(asoc);
return NULL;
}
@@ -545,8 +544,7 @@ out:
void sctp_err_finish(struct sock *sk, struct sctp_association *asoc)
{
sctp_bh_unlock_sock(sk);
- if (asoc)
- sctp_association_put(asoc);
+ sctp_association_put(asoc);
}
/*