summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexey Dobriyan <adobriyan@gmail.com>2017-03-24 01:29:40 +0300
committerSteffen Klassert <steffen.klassert@secunet.com>2017-03-24 07:03:12 +0100
commit1560875600b8aa88ff0f55f827a7741c026795ee (patch)
tree1a8ea1f2e33ee61a7da502e5648f99dabd33c99a
parentadd641e7dee31b36aee83412c29e39dd1f5e0c9c (diff)
downloadlinux-stable-1560875600b8aa88ff0f55f827a7741c026795ee.tar.gz
linux-stable-1560875600b8aa88ff0f55f827a7741c026795ee.tar.bz2
linux-stable-1560875600b8aa88ff0f55f827a7741c026795ee.zip
xfrm: remove unused struct xfrm_mgr::id
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
-rw-r--r--include/net/xfrm.h1
-rw-r--r--net/key/af_key.c1
-rw-r--r--net/xfrm/xfrm_user.c1
3 files changed, 0 insertions, 3 deletions
diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index 14d82bf16692..6e03a1a31eef 100644
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -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);
diff --git a/net/key/af_key.c b/net/key/af_key.c
index c6252ed42c1d..60cf2fb78d45 100644
--- a/net/key/af_key.c
+++ b/net/key/af_key.c
@@ -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,
diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
index 9705c279494b..8e696eafd067 100644
--- a/net/xfrm/xfrm_user.c
+++ b/net/xfrm/xfrm_user.c
@@ -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,