]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commit - net/xfrm/xfrm_state.c
xfrm: rename struct xfrm_filter
authorNicolas Dichtel <nicolas.dichtel@6wind.com>
Thu, 6 Mar 2014 17:24:29 +0000 (18:24 +0100)
committerSteffen Klassert <steffen.klassert@secunet.com>
Fri, 7 Mar 2014 07:12:37 +0000 (08:12 +0100)
commit870a2df4ca026817eb87bb2f9daaa60a93fd051a
tree4a52243174074e0fc5b1a838ae5cf3e31f688190
parente50287be7c007a10e6e2e3332e52466faf4b6a04
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>
include/net/xfrm.h
include/uapi/linux/xfrm.h
net/key/af_key.c
net/xfrm/xfrm_state.c
net/xfrm/xfrm_user.c