aboutsummaryrefslogtreecommitdiffstats
path: root/net/xfrm
diff options
context:
space:
mode:
authorAlexey Dobriyan <adobriyan@gmail.com>2011-11-20 22:39:03 -0500
committerDavid S. Miller <davem@davemloft.net>2011-11-22 16:43:32 -0500
commit4e3fd7a06dc20b2d8ec6892233ad2012968fe7b6 (patch)
treeda3fbec7672ac6b967dfa31cec6c88f468a57fa2 /net/xfrm
parent40ba84993d66469d336099c5af74c3da5b73e28d (diff)
net: remove ipv6_addr_copy()
C assignment can handle struct in6_addr copying. Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/xfrm')
-rw-r--r--net/xfrm/xfrm_state.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
index 9414b9c5b1e4..5b228f97d4b3 100644
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c
@@ -1035,16 +1035,12 @@ static struct xfrm_state *__find_acq_core(struct net *net, struct xfrm_mark *m,
1035 break; 1035 break;
1036 1036
1037 case AF_INET6: 1037 case AF_INET6:
1038 ipv6_addr_copy((struct in6_addr *)x->sel.daddr.a6, 1038 *(struct in6_addr *)x->sel.daddr.a6 = *(struct in6_addr *)daddr;
1039 (const struct in6_addr *)daddr); 1039 *(struct in6_addr *)x->sel.saddr.a6 = *(struct in6_addr *)saddr;
1040 ipv6_addr_copy((struct in6_addr *)x->sel.saddr.a6,
1041 (const struct in6_addr *)saddr);
1042 x->sel.prefixlen_d = 128; 1040 x->sel.prefixlen_d = 128;
1043 x->sel.prefixlen_s = 128; 1041 x->sel.prefixlen_s = 128;
1044 ipv6_addr_copy((struct in6_addr *)x->props.saddr.a6, 1042 *(struct in6_addr *)x->props.saddr.a6 = *(struct in6_addr *)saddr;
1045 (const struct in6_addr *)saddr); 1043 *(struct in6_addr *)x->id.daddr.a6 = *(struct in6_addr *)daddr;
1046 ipv6_addr_copy((struct in6_addr *)x->id.daddr.a6,
1047 (const struct in6_addr *)daddr);
1048 break; 1044 break;
1049 } 1045 }
1050 1046