diff options
author | Nicolas Dichtel <nicolas.dichtel@6wind.com> | 2014-03-06 12:24:29 -0500 |
---|---|---|
committer | Steffen Klassert <steffen.klassert@secunet.com> | 2014-03-07 02:12:37 -0500 |
commit | 870a2df4ca026817eb87bb2f9daaa60a93fd051a (patch) | |
tree | 4a52243174074e0fc5b1a838ae5cf3e31f688190 /net/key | |
parent | e50287be7c007a10e6e2e3332e52466faf4b6a04 (diff) |
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>
Diffstat (limited to 'net/key')
-rw-r--r-- | net/key/af_key.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/key/af_key.c b/net/key/af_key.c index a50d979b5926..12651b42aad8 100644 --- 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) | |||
1799 | static int pfkey_dump(struct sock *sk, struct sk_buff *skb, const struct sadb_msg *hdr, void * const *ext_hdrs) | 1799 | static int pfkey_dump(struct sock *sk, struct sk_buff *skb, const struct sadb_msg *hdr, void * const *ext_hdrs) |
1800 | { | 1800 | { |
1801 | u8 proto; | 1801 | u8 proto; |
1802 | struct xfrm_filter *filter = NULL; | 1802 | struct xfrm_address_filter *filter = NULL; |
1803 | struct pfkey_sock *pfk = pfkey_sk(sk); | 1803 | struct pfkey_sock *pfk = pfkey_sk(sk); |
1804 | 1804 | ||
1805 | if (pfk->dump.dump != NULL) | 1805 | if (pfk->dump.dump != NULL) |