backport two changes from kernel.org: 65e9b62d4503849b10bedfc29bff0473760cc597 ipv6...