diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/ipv6/ip6_tunnel.c | 4 | ||||
-rw-r--r-- | net/tipc/eth_media.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c index d994c55a5b16..af256d47fd35 100644 --- a/net/ipv6/ip6_tunnel.c +++ b/net/ipv6/ip6_tunnel.c | |||
@@ -1100,8 +1100,8 @@ static void ip6_tnl_link_config(struct ip6_tnl *t) | |||
1100 | struct ip6_tnl_parm *p = &t->parms; | 1100 | struct ip6_tnl_parm *p = &t->parms; |
1101 | struct flowi *fl = &t->fl; | 1101 | struct flowi *fl = &t->fl; |
1102 | 1102 | ||
1103 | memcpy(&dev->dev_addr, &p->laddr, sizeof(struct in6_addr)); | 1103 | memcpy(dev->dev_addr, &p->laddr, sizeof(struct in6_addr)); |
1104 | memcpy(&dev->broadcast, &p->raddr, sizeof(struct in6_addr)); | 1104 | memcpy(dev->broadcast, &p->raddr, sizeof(struct in6_addr)); |
1105 | 1105 | ||
1106 | /* Set up flowi template */ | 1106 | /* Set up flowi template */ |
1107 | ipv6_addr_copy(&fl->fl6_src, &p->laddr); | 1107 | ipv6_addr_copy(&fl->fl6_src, &p->laddr); |
diff --git a/net/tipc/eth_media.c b/net/tipc/eth_media.c index f72ba774c246..524ba5696d4d 100644 --- a/net/tipc/eth_media.c +++ b/net/tipc/eth_media.c | |||
@@ -167,7 +167,7 @@ static int enable_bearer(struct tipc_bearer *tb_ptr) | |||
167 | tb_ptr->mtu = dev->mtu; | 167 | tb_ptr->mtu = dev->mtu; |
168 | tb_ptr->blocked = 0; | 168 | tb_ptr->blocked = 0; |
169 | tb_ptr->addr.type = htonl(TIPC_MEDIA_TYPE_ETH); | 169 | tb_ptr->addr.type = htonl(TIPC_MEDIA_TYPE_ETH); |
170 | memcpy(&tb_ptr->addr.dev_addr, &dev->dev_addr, ETH_ALEN); | 170 | memcpy(&tb_ptr->addr.dev_addr, dev->dev_addr, ETH_ALEN); |
171 | return 0; | 171 | return 0; |
172 | } | 172 | } |
173 | 173 | ||