xfrm: rename struct xfrm_filter

iproute2 already defines a structure with that name, let's use another one to
avoid any conflict.

CC: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>

diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index 8b925288a8bc0064d46f2d053c1923d3f29bb3f7..ce3d96f752fdcf9a74746be50e5e30229216f4d9 100644 (file)
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -121,7 +121,7 @@ struct xfrm_state_walk {
        u8                      dying;
        u8                      proto;
        u32                     seq;
-       struct xfrm_filter      *filter;
+       struct xfrm_address_filter *filter;
 };
 
 /* Full description of state of transformer. */
@@ -1423,7 +1423,7 @@ static inline void xfrm_sysctl_fini(struct net *net)
 #endif
 
 void xfrm_state_walk_init(struct xfrm_state_walk *walk, u8 proto,
-                         struct xfrm_filter *filter);
+                         struct xfrm_address_filter *filter);
 int xfrm_state_walk(struct net *net, struct xfrm_state_walk *walk,
                    int (*func)(struct xfrm_state *, int, void*), void *);
 void xfrm_state_walk_done(struct xfrm_state_walk *walk, struct net *net);

diff --git a/include/uapi/linux/xfrm.h b/include/uapi/linux/xfrm.h
index 6550c679584f46b39f1a2f22733460ba294b66f7..25e5dd916ba491feba3f1d570e8712283a95645e 100644 (file)
--- a/include/uapi/linux/xfrm.h
+++ b/include/uapi/linux/xfrm.h
@@ -299,7 +299,7 @@ enum xfrm_attr_type_t {
        XFRMA_REPLAY_ESN_VAL,   /* struct xfrm_replay_esn */
        XFRMA_SA_EXTRA_FLAGS,   /* __u32 */
        XFRMA_PROTO,            /* __u8 */
-       XFRMA_FILTER,           /* struct xfrm_filter */
+       XFRMA_ADDRESS_FILTER,   /* struct xfrm_address_filter */
        __XFRMA_MAX
 
 #define XFRMA_MAX (__XFRMA_MAX - 1)
@@ -476,7 +476,7 @@ struct xfrm_user_mapping {
        __be16                          new_sport;
 };
 
-struct xfrm_filter {
+struct xfrm_address_filter {
        xfrm_address_t                  saddr;
        xfrm_address_t                  daddr;
        __u16                           family;

diff --git a/net/key/af_key.c b/net/key/af_key.c
index a50d979b592660aacfe711b9c73d93da00c7178a..12651b42aad894c67317cca308bcb89f4c16cd67 100644 (file)
--- a/net/key/af_key.c
+++ b/net/key/af_key.c
@@ -1799,7 +1799,7 @@ static void pfkey_dump_sa_done(struct pfkey_sock *pfk)
 static int pfkey_dump(struct sock *sk, struct sk_buff *skb, const struct sadb_msg *hdr, void * const *ext_hdrs)
 {
        u8 proto;
-       struct xfrm_filter *filter = NULL;
+       struct xfrm_address_filter *filter = NULL;
        struct pfkey_sock *pfk = pfkey_sk(sk);
 
        if (pfk->dump.dump != NULL)

diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
index 5339c26bb0cfeb1a7ee83dff854ea5a037847e18..cee850c761657362d90529edf61fa74f2335d45a 100644 (file)
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c
@@ -1598,7 +1598,7 @@ unlock:
 EXPORT_SYMBOL(xfrm_alloc_spi);
 
 static bool __xfrm_state_filter_match(struct xfrm_state *x,
-                                     struct xfrm_filter *filter)
+                                     struct xfrm_address_filter *filter)
 {
        if (filter) {
                if ((filter->family == AF_INET ||
@@ -1657,7 +1657,7 @@ out:
 EXPORT_SYMBOL(xfrm_state_walk);
 
 void xfrm_state_walk_init(struct xfrm_state_walk *walk, u8 proto,
-                         struct xfrm_filter *filter)
+                         struct xfrm_address_filter *filter)
 {
        INIT_LIST_HEAD(&walk->all);
        walk->proto = proto;

diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
index 023e5e7ea4c6fc762228772cc5211d94f8b9426d..903725b8cc70b8cf72af5aa341376ad8f36de466 100644 (file)
--- a/net/xfrm/xfrm_user.c
+++ b/net/xfrm/xfrm_user.c
@@ -904,7 +904,7 @@ static int xfrm_dump_sa(struct sk_buff *skb, struct netlink_callback *cb)
 
        if (!cb->args[0]) {
                struct nlattr *attrs[XFRMA_MAX+1];
-               struct xfrm_filter *filter = NULL;
+               struct xfrm_address_filter *filter = NULL;
                u8 proto = 0;
                int err;
 
@@ -915,12 +915,12 @@ static int xfrm_dump_sa(struct sk_buff *skb, struct netlink_callback *cb)
                if (err < 0)
                        return err;
 
-               if (attrs[XFRMA_FILTER]) {
+               if (attrs[XFRMA_ADDRESS_FILTER]) {
                        filter = kmalloc(sizeof(*filter), GFP_KERNEL);
                        if (filter == NULL)
                                return -ENOMEM;
 
-                       memcpy(filter, nla_data(attrs[XFRMA_FILTER]),
+                       memcpy(filter, nla_data(attrs[XFRMA_ADDRESS_FILTER]),
                               sizeof(*filter));
                }
 
@@ -2334,7 +2334,7 @@ static const struct nla_policy xfrma_policy[XFRMA_MAX+1] = {
        [XFRMA_REPLAY_ESN_VAL]  = { .len = sizeof(struct xfrm_replay_state_esn) },
        [XFRMA_SA_EXTRA_FLAGS]  = { .type = NLA_U32 },
        [XFRMA_PROTO]           = { .type = NLA_U8 },
-       [XFRMA_FILTER]          = { .len = sizeof(struct xfrm_filter) },
+       [XFRMA_ADDRESS_FILTER]  = { .len = sizeof(struct xfrm_address_filter) },
 };
 
 static const struct xfrm_link {