Merge branch 'master' into staging-next

[firefly-linux-kernel-4.4.55.git] / net / sctp / protocol.c

diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c
index 34b7726bcd7ff472da4603fea6010bc39f467440..4e1d0fcb028efa3001a0b1b69eaf80836765b49c 100644 (file)
--- a/net/sctp/protocol.c
+++ b/net/sctp/protocol.c
@@ -634,10 +634,10 @@ static void sctp_addr_wq_timeout_handler(unsigned long arg)
                        /* ignore bound-specific endpoints */
                        if (!sctp_is_ep_boundall(sk))
                                continue;
-                       sctp_bh_lock_sock(sk);
+                       bh_lock_sock(sk);
                        if (sctp_asconf_mgmt(sp, addrw) < 0)
                                pr_debug("%s: sctp_asconf_mgmt failed\n", __func__);
-                       sctp_bh_unlock_sock(sk);
+                       bh_unlock_sock(sk);
                }
 #if IS_ENABLED(CONFIG_IPV6)
 free_next:
@@ -1030,6 +1030,7 @@ static const struct net_protocol sctp_protocol = {
        .err_handler = sctp_v4_err,
        .no_policy   = 1,
        .netns_ok    = 1,
+       .icmp_strict_tag_validation = 1,
 };
 
 /* IPv4 address related functions.  */
@@ -1460,7 +1461,6 @@ static __init int sctp_init(void)
        if (status)
                goto err_v6_add_protocol;
 
-       status = 0;
 out:
        return status;
 err_v6_add_protocol: