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/ip6_tunnel.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/ip6_tunnel.c')
-rw-r--r-- | net/ipv6/ip6_tunnel.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c index 83f0e31c5fbd..f5f98f558acb 100644 --- a/net/ipv6/ip6_tunnel.c +++ b/net/ipv6/ip6_tunnel.c | |||
@@ -979,8 +979,8 @@ static int ip6_tnl_xmit2(struct sk_buff *skb, | |||
979 | ipv6_change_dsfield(ipv6h, ~INET_ECN_MASK, dsfield); | 979 | ipv6_change_dsfield(ipv6h, ~INET_ECN_MASK, dsfield); |
980 | ipv6h->hop_limit = t->parms.hop_limit; | 980 | ipv6h->hop_limit = t->parms.hop_limit; |
981 | ipv6h->nexthdr = proto; | 981 | ipv6h->nexthdr = proto; |
982 | ipv6_addr_copy(&ipv6h->saddr, &fl6->saddr); | 982 | ipv6h->saddr = fl6->saddr; |
983 | ipv6_addr_copy(&ipv6h->daddr, &fl6->daddr); | 983 | ipv6h->daddr = fl6->daddr; |
984 | nf_reset(skb); | 984 | nf_reset(skb); |
985 | pkt_len = skb->len; | 985 | pkt_len = skb->len; |
986 | err = ip6_local_out(skb); | 986 | err = ip6_local_out(skb); |
@@ -1155,8 +1155,8 @@ static void ip6_tnl_link_config(struct ip6_tnl *t) | |||
1155 | memcpy(dev->broadcast, &p->raddr, sizeof(struct in6_addr)); | 1155 | memcpy(dev->broadcast, &p->raddr, sizeof(struct in6_addr)); |
1156 | 1156 | ||
1157 | /* Set up flowi template */ | 1157 | /* Set up flowi template */ |
1158 | ipv6_addr_copy(&fl6->saddr, &p->laddr); | 1158 | fl6->saddr = p->laddr; |
1159 | ipv6_addr_copy(&fl6->daddr, &p->raddr); | 1159 | fl6->daddr = p->raddr; |
1160 | fl6->flowi6_oif = p->link; | 1160 | fl6->flowi6_oif = p->link; |
1161 | fl6->flowlabel = 0; | 1161 | fl6->flowlabel = 0; |
1162 | 1162 | ||
@@ -1212,8 +1212,8 @@ static void ip6_tnl_link_config(struct ip6_tnl *t) | |||
1212 | static int | 1212 | static int |
1213 | ip6_tnl_change(struct ip6_tnl *t, struct ip6_tnl_parm *p) | 1213 | ip6_tnl_change(struct ip6_tnl *t, struct ip6_tnl_parm *p) |
1214 | { | 1214 | { |
1215 | ipv6_addr_copy(&t->parms.laddr, &p->laddr); | 1215 | t->parms.laddr = p->laddr; |
1216 | ipv6_addr_copy(&t->parms.raddr, &p->raddr); | 1216 | t->parms.raddr = p->raddr; |
1217 | t->parms.flags = p->flags; | 1217 | t->parms.flags = p->flags; |
1218 | t->parms.hop_limit = p->hop_limit; | 1218 | t->parms.hop_limit = p->hop_limit; |
1219 | t->parms.encap_limit = p->encap_limit; | 1219 | t->parms.encap_limit = p->encap_limit; |