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 <[email protected]>
Acked-by: Neil Horman <[email protected]>
Acked-by: Vlad Yasevich <[email protected]>
Signed-off-by: David S. Miller <[email protected]>

diff --git a/net/sctp/input.c b/net/sctp/input.c
index 66038533ca5c572191666c045739ee7570ad4f53..2a192a7c5d81b3380d5ae497cb3789eb9c8134be 100644 (file)
--- 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);
 }
 
 /*