summaryrefslogtreecommitdiffstats
path: root/net/netlabel
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/netlabel
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/netlabel')
-rw-r--r--net/netlabel/netlabel_kapi.c4
-rw-r--r--net/netlabel/netlabel_mgmt.c4
-rw-r--r--net/netlabel/netlabel_unlabeled.c4
3 files changed, 6 insertions, 6 deletions
diff --git a/net/netlabel/netlabel_kapi.c b/net/netlabel/netlabel_kapi.c
index 9c24de10a657..8ed67dccf11d 100644
--- a/net/netlabel/netlabel_kapi.c
+++ b/net/netlabel/netlabel_kapi.c
@@ -155,12 +155,12 @@ int netlbl_cfg_unlbl_map_add(const char *domain,
155 if (map6 == NULL) 155 if (map6 == NULL)
156 goto cfg_unlbl_map_add_failure; 156 goto cfg_unlbl_map_add_failure;
157 map6->type = NETLBL_NLTYPE_UNLABELED; 157 map6->type = NETLBL_NLTYPE_UNLABELED;
158 ipv6_addr_copy(&map6->list.addr, addr6); 158 map6->list.addr = *addr6;
159 map6->list.addr.s6_addr32[0] &= mask6->s6_addr32[0]; 159 map6->list.addr.s6_addr32[0] &= mask6->s6_addr32[0];
160 map6->list.addr.s6_addr32[1] &= mask6->s6_addr32[1]; 160 map6->list.addr.s6_addr32[1] &= mask6->s6_addr32[1];
161 map6->list.addr.s6_addr32[2] &= mask6->s6_addr32[2]; 161 map6->list.addr.s6_addr32[2] &= mask6->s6_addr32[2];
162 map6->list.addr.s6_addr32[3] &= mask6->s6_addr32[3]; 162 map6->list.addr.s6_addr32[3] &= mask6->s6_addr32[3];
163 ipv6_addr_copy(&map6->list.mask, mask6); 163 map6->list.mask = *mask6;
164 map6->list.valid = 1; 164 map6->list.valid = 1;
165 ret_val = netlbl_af4list_add(&map4->list, 165 ret_val = netlbl_af4list_add(&map4->list,
166 &addrmap->list4); 166 &addrmap->list4);
diff --git a/net/netlabel/netlabel_mgmt.c b/net/netlabel/netlabel_mgmt.c
index bfa555869775..9879300beefd 100644
--- a/net/netlabel/netlabel_mgmt.c
+++ b/net/netlabel/netlabel_mgmt.c
@@ -216,12 +216,12 @@ static int netlbl_mgmt_add_common(struct genl_info *info,
216 ret_val = -ENOMEM; 216 ret_val = -ENOMEM;
217 goto add_failure; 217 goto add_failure;
218 } 218 }
219 ipv6_addr_copy(&map->list.addr, addr); 219 map->list.addr = *addr;
220 map->list.addr.s6_addr32[0] &= mask->s6_addr32[0]; 220 map->list.addr.s6_addr32[0] &= mask->s6_addr32[0];
221 map->list.addr.s6_addr32[1] &= mask->s6_addr32[1]; 221 map->list.addr.s6_addr32[1] &= mask->s6_addr32[1];
222 map->list.addr.s6_addr32[2] &= mask->s6_addr32[2]; 222 map->list.addr.s6_addr32[2] &= mask->s6_addr32[2];
223 map->list.addr.s6_addr32[3] &= mask->s6_addr32[3]; 223 map->list.addr.s6_addr32[3] &= mask->s6_addr32[3];
224 ipv6_addr_copy(&map->list.mask, mask); 224 map->list.mask = *mask;
225 map->list.valid = 1; 225 map->list.valid = 1;
226 map->type = entry->type; 226 map->type = entry->type;
227 227
diff --git a/net/netlabel/netlabel_unlabeled.c b/net/netlabel/netlabel_unlabeled.c
index e251c2c88521..049ccd2447d7 100644
--- a/net/netlabel/netlabel_unlabeled.c
+++ b/net/netlabel/netlabel_unlabeled.c
@@ -300,12 +300,12 @@ static int netlbl_unlhsh_add_addr6(struct netlbl_unlhsh_iface *iface,
300 if (entry == NULL) 300 if (entry == NULL)
301 return -ENOMEM; 301 return -ENOMEM;
302 302
303 ipv6_addr_copy(&entry->list.addr, addr); 303 entry->list.addr = *addr;
304 entry->list.addr.s6_addr32[0] &= mask->s6_addr32[0]; 304 entry->list.addr.s6_addr32[0] &= mask->s6_addr32[0];
305 entry->list.addr.s6_addr32[1] &= mask->s6_addr32[1]; 305 entry->list.addr.s6_addr32[1] &= mask->s6_addr32[1];
306 entry->list.addr.s6_addr32[2] &= mask->s6_addr32[2]; 306 entry->list.addr.s6_addr32[2] &= mask->s6_addr32[2];
307 entry->list.addr.s6_addr32[3] &= mask->s6_addr32[3]; 307 entry->list.addr.s6_addr32[3] &= mask->s6_addr32[3];
308 ipv6_addr_copy(&entry->list.mask, mask); 308 entry->list.mask = *mask;
309 entry->list.valid = 1; 309 entry->list.valid = 1;
310 entry->secid = secid; 310 entry->secid = secid;
311 311