diff options
| author | Nicolas Dichtel <nicolas.dichtel@6wind.com> | 2014-03-06 18:24:29 +0100 |
|---|---|---|
| committer | Steffen Klassert <steffen.klassert@secunet.com> | 2014-03-07 08:12:37 +0100 |
| commit | 870a2df4ca026817eb87bb2f9daaa60a93fd051a (patch) | |
| tree | 4a52243174074e0fc5b1a838ae5cf3e31f688190 /net/key/af_key.c | |
| parent | e50287be7c007a10e6e2e3332e52466faf4b6a04 (diff) | |
| download | op-kernel-dev-870a2df4ca026817eb87bb2f9daaa60a93fd051a.zip op-kernel-dev-870a2df4ca026817eb87bb2f9daaa60a93fd051a.tar.gz | |
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/af_key.c')
| -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 a50d979..12651b4 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) 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) |
