diff options
Diffstat (limited to 'net/bridge/br_multicast.c')
-rw-r--r-- | net/bridge/br_multicast.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c index a5f4e5769809..7743e0d109ea 100644 --- a/net/bridge/br_multicast.c +++ b/net/bridge/br_multicast.c | |||
@@ -127,7 +127,7 @@ static struct net_bridge_mdb_entry *br_mdb_ip6_get( | |||
127 | { | 127 | { |
128 | struct br_ip br_dst; | 128 | struct br_ip br_dst; |
129 | 129 | ||
130 | ipv6_addr_copy(&br_dst.u.ip6, dst); | 130 | br_dst.u.ip6 = *dst; |
131 | br_dst.proto = htons(ETH_P_IPV6); | 131 | br_dst.proto = htons(ETH_P_IPV6); |
132 | 132 | ||
133 | return br_mdb_ip_get(mdb, &br_dst); | 133 | return br_mdb_ip_get(mdb, &br_dst); |
@@ -154,7 +154,7 @@ struct net_bridge_mdb_entry *br_mdb_get(struct net_bridge *br, | |||
154 | break; | 154 | break; |
155 | #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) | 155 | #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) |
156 | case htons(ETH_P_IPV6): | 156 | case htons(ETH_P_IPV6): |
157 | ipv6_addr_copy(&ip.u.ip6, &ipv6_hdr(skb)->daddr); | 157 | ip.u.ip6 = ipv6_hdr(skb)->daddr; |
158 | break; | 158 | break; |
159 | #endif | 159 | #endif |
160 | default: | 160 | default: |
@@ -474,7 +474,7 @@ static struct sk_buff *br_ip6_multicast_alloc_query(struct net_bridge *br, | |||
474 | mldq->mld_cksum = 0; | 474 | mldq->mld_cksum = 0; |
475 | mldq->mld_maxdelay = htons((u16)jiffies_to_msecs(interval)); | 475 | mldq->mld_maxdelay = htons((u16)jiffies_to_msecs(interval)); |
476 | mldq->mld_reserved = 0; | 476 | mldq->mld_reserved = 0; |
477 | ipv6_addr_copy(&mldq->mld_mca, group); | 477 | mldq->mld_mca = *group; |
478 | 478 | ||
479 | /* checksum */ | 479 | /* checksum */ |
480 | mldq->mld_cksum = csum_ipv6_magic(&ip6h->saddr, &ip6h->daddr, | 480 | mldq->mld_cksum = csum_ipv6_magic(&ip6h->saddr, &ip6h->daddr, |
@@ -783,7 +783,7 @@ static int br_ip6_multicast_add_group(struct net_bridge *br, | |||
783 | if (!ipv6_is_transient_multicast(group)) | 783 | if (!ipv6_is_transient_multicast(group)) |
784 | return 0; | 784 | return 0; |
785 | 785 | ||
786 | ipv6_addr_copy(&br_group.u.ip6, group); | 786 | br_group.u.ip6 = *group; |
787 | br_group.proto = htons(ETH_P_IPV6); | 787 | br_group.proto = htons(ETH_P_IPV6); |
788 | 788 | ||
789 | return br_multicast_add_group(br, port, &br_group); | 789 | return br_multicast_add_group(br, port, &br_group); |
@@ -1344,7 +1344,7 @@ static void br_ip6_multicast_leave_group(struct net_bridge *br, | |||
1344 | if (!ipv6_is_transient_multicast(group)) | 1344 | if (!ipv6_is_transient_multicast(group)) |
1345 | return; | 1345 | return; |
1346 | 1346 | ||
1347 | ipv6_addr_copy(&br_group.u.ip6, group); | 1347 | br_group.u.ip6 = *group; |
1348 | br_group.proto = htons(ETH_P_IPV6); | 1348 | br_group.proto = htons(ETH_P_IPV6); |
1349 | 1349 | ||
1350 | br_multicast_leave_group(br, port, &br_group); | 1350 | br_multicast_leave_group(br, port, &br_group); |