]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
xfrm: remove unused struct xfrm_mgr::id
authorAlexey Dobriyan <adobriyan@gmail.com>
Thu, 23 Mar 2017 22:29:40 +0000 (01:29 +0300)
committerSteffen Klassert <steffen.klassert@secunet.com>
Fri, 24 Mar 2017 06:03:12 +0000 (07:03 +0100)
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
include/net/xfrm.h
net/key/af_key.c
net/xfrm/xfrm_user.c

index 14d82bf16692a6d0ed66721b1548ba152dbc18de..6e03a1a31eef7d33de08ae399c8c15b18e19c3a6 100644 (file)
@@ -586,7 +586,6 @@ struct xfrm_migrate {
 
 struct xfrm_mgr {
        struct list_head        list;
-       char                    *id;
        int                     (*notify)(struct xfrm_state *x, const struct km_event *c);
        int                     (*acquire)(struct xfrm_state *x, struct xfrm_tmpl *, struct xfrm_policy *xp);
        struct xfrm_policy      *(*compile_policy)(struct sock *sk, int opt, u8 *data, int len, int *dir);
index c6252ed42c1de65dee149d7d869b62b96616e22a..60cf2fb78d458bdbb7253e6a557845bb6a465dc1 100644 (file)
@@ -3792,7 +3792,6 @@ static inline void pfkey_exit_proc(struct net *net)
 
 static struct xfrm_mgr pfkeyv2_mgr =
 {
-       .id             = "pfkeyv2",
        .notify         = pfkey_send_notify,
        .acquire        = pfkey_send_acquire,
        .compile_policy = pfkey_compile_policy,
index 9705c279494b248b759155d671cfbc778fa25058..8e696eafd067cdcd9ee6cb5debdef7a1f1f3849a 100644 (file)
@@ -3101,7 +3101,6 @@ static bool xfrm_is_alive(const struct km_event *c)
 }
 
 static struct xfrm_mgr netlink_mgr = {
-       .id             = "netlink",
        .notify         = xfrm_send_state_notify,
        .acquire        = xfrm_send_acquire,
        .compile_policy = xfrm_compile_policy,