aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/xfrm6_output.c
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/ipv6/xfrm6_output.c
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/ipv6/xfrm6_output.c')
-rw-r--r--net/ipv6/xfrm6_output.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/xfrm6_output.c b/net/ipv6/xfrm6_output.c
index faae41737fca..4eeff89c1aaa 100644
--- a/net/ipv6/xfrm6_output.c
+++ b/net/ipv6/xfrm6_output.c
@@ -49,7 +49,7 @@ static void xfrm6_local_rxpmtu(struct sk_buff *skb, u32 mtu)
49 struct sock *sk = skb->sk; 49 struct sock *sk = skb->sk;
50 50
51 fl6.flowi6_oif = sk->sk_bound_dev_if; 51 fl6.flowi6_oif = sk->sk_bound_dev_if;
52 ipv6_addr_copy(&fl6.daddr, &ipv6_hdr(skb)->daddr); 52 fl6.daddr = ipv6_hdr(skb)->daddr;
53 53
54 ipv6_local_rxpmtu(sk, &fl6, mtu); 54 ipv6_local_rxpmtu(sk, &fl6, mtu);
55} 55}
@@ -60,7 +60,7 @@ static void xfrm6_local_error(struct sk_buff *skb, u32 mtu)
60 struct sock *sk = skb->sk; 60 struct sock *sk = skb->sk;
61 61
62 fl6.fl6_dport = inet_sk(sk)->inet_dport; 62 fl6.fl6_dport = inet_sk(sk)->inet_dport;
63 ipv6_addr_copy(&fl6.daddr, &ipv6_hdr(skb)->daddr); 63 fl6.daddr = ipv6_hdr(skb)->daddr;
64 64
65 ipv6_local_error(sk, EMSGSIZE, &fl6, mtu); 65 ipv6_local_error(sk, EMSGSIZE, &fl6, mtu);
66} 66}