aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/ip6mr.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/ip6mr.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/ip6mr.c')
-rw-r--r--net/ipv6/ip6mr.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c
index 449a9185b8f2..c7e95c8c579f 100644
--- a/net/ipv6/ip6mr.c
+++ b/net/ipv6/ip6mr.c
@@ -1105,8 +1105,8 @@ static int ip6mr_cache_report(struct mr6_table *mrt, struct sk_buff *pkt,
1105 msg->im6_msgtype = MRT6MSG_WHOLEPKT; 1105 msg->im6_msgtype = MRT6MSG_WHOLEPKT;
1106 msg->im6_mif = mrt->mroute_reg_vif_num; 1106 msg->im6_mif = mrt->mroute_reg_vif_num;
1107 msg->im6_pad = 0; 1107 msg->im6_pad = 0;
1108 ipv6_addr_copy(&msg->im6_src, &ipv6_hdr(pkt)->saddr); 1108 msg->im6_src = ipv6_hdr(pkt)->saddr;
1109 ipv6_addr_copy(&msg->im6_dst, &ipv6_hdr(pkt)->daddr); 1109 msg->im6_dst = ipv6_hdr(pkt)->daddr;
1110 1110
1111 skb->ip_summed = CHECKSUM_UNNECESSARY; 1111 skb->ip_summed = CHECKSUM_UNNECESSARY;
1112 } else 1112 } else
@@ -1131,8 +1131,8 @@ static int ip6mr_cache_report(struct mr6_table *mrt, struct sk_buff *pkt,
1131 msg->im6_msgtype = assert; 1131 msg->im6_msgtype = assert;
1132 msg->im6_mif = mifi; 1132 msg->im6_mif = mifi;
1133 msg->im6_pad = 0; 1133 msg->im6_pad = 0;
1134 ipv6_addr_copy(&msg->im6_src, &ipv6_hdr(pkt)->saddr); 1134 msg->im6_src = ipv6_hdr(pkt)->saddr;
1135 ipv6_addr_copy(&msg->im6_dst, &ipv6_hdr(pkt)->daddr); 1135 msg->im6_dst = ipv6_hdr(pkt)->daddr;
1136 1136
1137 skb_dst_set(skb, dst_clone(skb_dst(pkt))); 1137 skb_dst_set(skb, dst_clone(skb_dst(pkt)));
1138 skb->ip_summed = CHECKSUM_UNNECESSARY; 1138 skb->ip_summed = CHECKSUM_UNNECESSARY;
@@ -2181,8 +2181,8 @@ int ip6mr_get_route(struct net *net,
2181 iph->payload_len = 0; 2181 iph->payload_len = 0;
2182 iph->nexthdr = IPPROTO_NONE; 2182 iph->nexthdr = IPPROTO_NONE;
2183 iph->hop_limit = 0; 2183 iph->hop_limit = 0;
2184 ipv6_addr_copy(&iph->saddr, &rt->rt6i_src.addr); 2184 iph->saddr = rt->rt6i_src.addr;
2185 ipv6_addr_copy(&iph->daddr, &rt->rt6i_dst.addr); 2185 iph->daddr = rt->rt6i_dst.addr;
2186 2186
2187 err = ip6mr_cache_unresolved(mrt, vif, skb2); 2187 err = ip6mr_cache_unresolved(mrt, vif, skb2);
2188 read_unlock(&mrt_lock); 2188 read_unlock(&mrt_lock);