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/mcast.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/mcast.c')
-rw-r--r-- | net/ipv6/mcast.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c index 7b94bebb73b1..6cc4d1fb8c13 100644 --- a/net/ipv6/mcast.c +++ b/net/ipv6/mcast.c | |||
@@ -155,7 +155,7 @@ int ipv6_sock_mc_join(struct sock *sk, int ifindex, const struct in6_addr *addr) | |||
155 | return -ENOMEM; | 155 | return -ENOMEM; |
156 | 156 | ||
157 | mc_lst->next = NULL; | 157 | mc_lst->next = NULL; |
158 | ipv6_addr_copy(&mc_lst->addr, addr); | 158 | mc_lst->addr = *addr; |
159 | 159 | ||
160 | rcu_read_lock(); | 160 | rcu_read_lock(); |
161 | if (ifindex == 0) { | 161 | if (ifindex == 0) { |
@@ -858,7 +858,7 @@ int ipv6_dev_mc_inc(struct net_device *dev, const struct in6_addr *addr) | |||
858 | 858 | ||
859 | setup_timer(&mc->mca_timer, igmp6_timer_handler, (unsigned long)mc); | 859 | setup_timer(&mc->mca_timer, igmp6_timer_handler, (unsigned long)mc); |
860 | 860 | ||
861 | ipv6_addr_copy(&mc->mca_addr, addr); | 861 | mc->mca_addr = *addr; |
862 | mc->idev = idev; /* (reference taken) */ | 862 | mc->idev = idev; /* (reference taken) */ |
863 | mc->mca_users = 1; | 863 | mc->mca_users = 1; |
864 | /* mca_stamp should be updated upon changes */ | 864 | /* mca_stamp should be updated upon changes */ |
@@ -1776,7 +1776,7 @@ static void igmp6_send(struct in6_addr *addr, struct net_device *dev, int type) | |||
1776 | hdr = (struct mld_msg *) skb_put(skb, sizeof(struct mld_msg)); | 1776 | hdr = (struct mld_msg *) skb_put(skb, sizeof(struct mld_msg)); |
1777 | memset(hdr, 0, sizeof(struct mld_msg)); | 1777 | memset(hdr, 0, sizeof(struct mld_msg)); |
1778 | hdr->mld_type = type; | 1778 | hdr->mld_type = type; |
1779 | ipv6_addr_copy(&hdr->mld_mca, addr); | 1779 | hdr->mld_mca = *addr; |
1780 | 1780 | ||
1781 | hdr->mld_cksum = csum_ipv6_magic(saddr, snd_addr, len, | 1781 | hdr->mld_cksum = csum_ipv6_magic(saddr, snd_addr, len, |
1782 | IPPROTO_ICMPV6, | 1782 | IPPROTO_ICMPV6, |