diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2022-01-12 07:40:50 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-12 07:40:50 -0300 |
| commit | 712fcc850e5a6d0867b0d97a0b79f1addd01998f (patch) | |
| tree | d092452bebc70059ffa9f913a1daea74d656300e /net/ipv6/addrconf.c | |
| parent | e99f775ed2f46b225106f0a156116a0080d16740 (diff) | |
| parent | 0156d956a951c70743d2338132662b29aeb8847d (diff) | |
Merge pull request #517 from denisdrozdov/5.4-2.3.x-imx
Merge tag 'v5.4.161' into 5.4-2.3.x-imx
Diffstat (limited to 'net/ipv6/addrconf.c')
| -rw-r--r-- | net/ipv6/addrconf.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 366c3792b860..d1f29a3eb70b 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -3111,6 +3111,9 @@ static void sit_add_v4_addrs(struct inet6_dev *idev) memcpy(&addr.s6_addr32[3], idev->dev->dev_addr, 4); if (idev->dev->flags&IFF_POINTOPOINT) { + if (idev->cnf.addr_gen_mode == IN6_ADDR_GEN_MODE_NONE) + return; + addr.s6_addr32[0] = htonl(0xfe800000); scope = IFA_LINK; plen = 64; |