ulp: remove uid and user_visible members

They are not used anymore and therefore should be removed.

Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>

diff --git a/include/net/tcp.h b/include/net/tcp.h
index 14fdd7ce9992b97b602dfa4965cdec9fc27beb9a..8a61c3e8c15dfaf1095490814288c41c13a629f3 100644 (file)
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -2051,11 +2051,6 @@ enum hrtimer_restart tcp_pace_kick(struct hrtimer *timer);
 #define TCP_ULP_MAX            128
 #define TCP_ULP_BUF_MAX                (TCP_ULP_NAME_MAX*TCP_ULP_MAX)
 
-enum {
-       TCP_ULP_TLS,
-       TCP_ULP_BPF,
-};
-
 struct tcp_ulp_ops {
        struct list_head        list;
 
@@ -2064,9 +2059,7 @@ struct tcp_ulp_ops {
        /* cleanup ulp */
        void (*release)(struct sock *sk);
 
-       int             uid;
        char            name[TCP_ULP_NAME_MAX];
-       bool            user_visible;
        struct module   *owner;
 };
 int tcp_register_ulp(struct tcp_ulp_ops *type);

diff --git a/net/tls/tls_main.c b/net/tls/tls_main.c
index e90b6d53707749f4fb846c6a654cd1b54ba62014..311cec8e533dee755fc452977b4955e59893c13a 100644 (file)
--- a/net/tls/tls_main.c
+++ b/net/tls/tls_main.c
@@ -715,8 +715,6 @@ EXPORT_SYMBOL(tls_unregister_device);
 
 static struct tcp_ulp_ops tcp_tls_ulp_ops __read_mostly = {
        .name                   = "tls",
-       .uid                    = TCP_ULP_TLS,
-       .user_visible           = true,
        .owner                  = THIS_MODULE,
        .init                   = tls_init,
 };