diff options
author | Alexey Dobriyan <adobriyan@gmail.com> | 2011-11-20 22:39:03 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-11-22 16:43:32 -0500 |
commit | 4e3fd7a06dc20b2d8ec6892233ad2012968fe7b6 (patch) | |
tree | da3fbec7672ac6b967dfa31cec6c88f468a57fa2 /net/ipv6/ndisc.c | |
parent | 40ba84993d66469d336099c5af74c3da5b73e28d (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/ndisc.c')
-rw-r--r-- | net/ipv6/ndisc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c index d699ddcad4ce..a4769881c5b5 100644 --- a/net/ipv6/ndisc.c +++ b/net/ipv6/ndisc.c | |||
@@ -481,7 +481,7 @@ struct sk_buff *ndisc_build_skb(struct net_device *dev, | |||
481 | 481 | ||
482 | opt = skb_transport_header(skb) + sizeof(struct icmp6hdr); | 482 | opt = skb_transport_header(skb) + sizeof(struct icmp6hdr); |
483 | if (target) { | 483 | if (target) { |
484 | ipv6_addr_copy((struct in6_addr *)opt, target); | 484 | *(struct in6_addr *)opt = *target; |
485 | opt += sizeof(*target); | 485 | opt += sizeof(*target); |
486 | } | 486 | } |
487 | 487 | ||
@@ -1622,9 +1622,9 @@ void ndisc_send_redirect(struct sk_buff *skb, struct neighbour *neigh, | |||
1622 | */ | 1622 | */ |
1623 | 1623 | ||
1624 | addrp = (struct in6_addr *)(icmph + 1); | 1624 | addrp = (struct in6_addr *)(icmph + 1); |
1625 | ipv6_addr_copy(addrp, target); | 1625 | *addrp = *target; |
1626 | addrp++; | 1626 | addrp++; |
1627 | ipv6_addr_copy(addrp, &ipv6_hdr(skb)->daddr); | 1627 | *addrp = ipv6_hdr(skb)->daddr; |
1628 | 1628 | ||
1629 | opt = (u8*) (addrp + 1); | 1629 | opt = (u8*) (addrp + 1); |
1630 | 1630 | ||