Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

[platform/kernel/linux-starfive.git] / net / sctp / protocol.c

diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c
index 25192b3..3c1fbf3 100644 (file)
--- a/net/sctp/protocol.c
+++ b/net/sctp/protocol.c
@@ -855,23 +855,6 @@ static int sctp_udp_rcv(struct sock *sk, struct sk_buff *skb)
        return 0;
 }
 
-static int sctp_udp_err_lookup(struct sock *sk, struct sk_buff *skb)
-{
-       struct sctp_association *asoc;
-       struct sctp_transport *t;
-       int family;
-
-       skb->transport_header += sizeof(struct udphdr);
-       family = (ip_hdr(skb)->version == 4) ? AF_INET : AF_INET6;
-       sk = sctp_err_lookup(dev_net(skb->dev), family, skb, sctp_hdr(skb),
-                            &asoc, &t);
-       if (!sk)
-               return -ENOENT;
-
-       sctp_err_finish(sk, t);
-       return 0;
-}
-
 int sctp_udp_sock_start(struct net *net)
 {
        struct udp_tunnel_sock_cfg tuncfg = {NULL};
@@ -890,7 +873,7 @@ int sctp_udp_sock_start(struct net *net)
 
        tuncfg.encap_type = 1;
        tuncfg.encap_rcv = sctp_udp_rcv;
-       tuncfg.encap_err_lookup = sctp_udp_err_lookup;
+       tuncfg.encap_err_lookup = sctp_udp_v4_err;
        setup_udp_tunnel_sock(net, sock, &tuncfg);
        net->sctp.udp4_sock = sock->sk;
 
@@ -912,7 +895,7 @@ int sctp_udp_sock_start(struct net *net)
 
        tuncfg.encap_type = 1;
        tuncfg.encap_rcv = sctp_udp_rcv;
-       tuncfg.encap_err_lookup = sctp_udp_err_lookup;
+       tuncfg.encap_err_lookup = sctp_udp_v6_err;
        setup_udp_tunnel_sock(net, sock, &tuncfg);
        net->sctp.udp6_sock = sock->sk;
 #endif
@@ -1176,7 +1159,6 @@ static const struct net_protocol sctp_protocol = {
        .handler     = sctp4_rcv,
        .err_handler = sctp_v4_err,
        .no_policy   = 1,
-       .netns_ok    = 1,
        .icmp_strict_tag_validation = 1,
 };