bareudp: remove unnecessary udp_encap_enable() in bareudp_socket_create()
authorTaehee Yoo <ap420073@gmail.com>
Sun, 8 Mar 2020 01:19:30 +0000 (01:19 +0000)
committerDavid S. Miller <davem@davemloft.net>
Mon, 9 Mar 2020 04:22:29 +0000 (21:22 -0700)
In the current code, udp_encap_enable() is called in
bareudp_socket_create().
But, setup_udp_tunnel_sock() internally calls udp_encap_enable().
So, udp_encap_enable() is unnecessary.

Signed-off-by: Taehee Yoo <ap420073@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/bareudp.c

index c9d0d68..71a2f48 100644 (file)
@@ -250,9 +250,6 @@ static int bareudp_socket_create(struct bareudp_dev *bareudp, __be16 port)
        tunnel_cfg.encap_destroy = NULL;
        setup_udp_tunnel_sock(bareudp->net, sock, &tunnel_cfg);
 
-       if (sock->sk->sk_family == AF_INET6)
-               udp_encap_enable();
-
        rcu_assign_pointer(bareudp->sock, sock);
        return 0;
 }