@@ -1,6 +1,6 @@

-diff -ru systemd-228/src/network/networkd-link.c systemd-228-1/src/network/networkd-link.c

-+++ systemd-228-1/src/network/networkd-link.c	2016-02-22 21:32:34.266133364 -0800

+diff -aur systemd-228-1/src/network/networkd-link.c systemd-228-1a/src/network/networkd-link.c

+--- systemd-228-1/src/network/networkd-link.c	2016-05-18 16:19:06.757698227 -0700

 @@ -134,6 +134,26 @@

          return link->network->ip_forward & ADDRESS_FAMILY_IPV6;

  }

@@ -28,37 +28,12 @@ diff -ru systemd-228/src/network/networkd-link.c systemd-228-1/src/network/netwo

  bool link_ipv6_accept_ra_enabled(Link *link) {

          if (link->flags & IFF_LOOPBACK)

                  return false;

-@@ -602,22 +622,17 @@

-         Iterator i;

- 

-         assert(link);

--

-         if (!link->network)

-                 return;

--

-         if (!link->static_configured)

-                 return;

--

-         if (link_ipv4ll_enabled(link))

-                 if (!link->ipv4ll_address ||

+@@ -614,7 +634,7 @@

                      !link->ipv4ll_route)

                          return;

--

+ 

 -        if (link_ipv6ll_enabled(link))

 +        if (!link_ipv6_disabled(link) && link_ipv6ll_enabled(link))

                  if (in_addr_is_null(AF_INET6, (const union in_addr_union*) &link->ipv6ll_address) > 0)

                          return;

--

-         if ((link_dhcp4_enabled(link) && !link_dhcp6_enabled(link) &&

-              !link->dhcp4_configured) ||

-             (link_dhcp6_enabled(link) && !link_dhcp4_enabled(link) &&

-@@ -625,8 +640,7 @@

-             (link_dhcp4_enabled(link) && link_dhcp6_enabled(link) &&

-              !link->dhcp4_configured && !link->dhcp6_configured))

-                 return;

--

--        if (link_ipv6_accept_ra_enabled(link) && !link->ndisc_configured)

-+        if (!link_ipv6_disabled(link) && link_ipv6_accept_ra_enabled(link) && !link->ndisc_configured)

-                 return;

-         SET_FOREACH(a, link->addresses, i)

new file mode 100644

@@ -0,0 +1,103 @@

+diff -aur systemd-228/src/network/networkd-link.c systemd-228-1/src/network/networkd-link.c

+--- systemd-228/src/network/networkd-link.c	2015-11-17 23:59:06.000000000 -0800

+@@ -626,9 +626,6 @@

+              !link->dhcp4_configured && !link->dhcp6_configured))

+                 return;

+ 

+-        if (link_ipv6_accept_ra_enabled(link) && !link->ndisc_configured)

+-                return;

+-

+         SET_FOREACH(a, link->addresses, i)

+                 if (!address_is_ready(a))

+                         return;

+@@ -1926,6 +1923,7 @@

+ 

+ static int link_set_ipv6_accept_ra(Link *link) {

+         const char *p = NULL;

++        const char *v;

+         int r;

+ 

+         /* Make this a NOP if IPv6 is not available */

+@@ -1938,12 +1936,16 @@

+         if (!link->network)

+                 return 0;

+ 

++        if (link_ipv6_accept_ra_enabled(link))

++                v = "1";

++        else

++                v = "0";

++

+         p = strjoina("/proc/sys/net/ipv6/conf/", link->ifname, "/accept_ra");

+ 

+-        /* We handle router advertisments ourselves, tell the kernel to GTFO */

+-        r = write_string_file(p, "0", WRITE_STRING_FILE_VERIFY_ON_FAILURE);

++        r = write_string_file(p, v, WRITE_STRING_FILE_VERIFY_ON_FAILURE);

+         if (r < 0)

+-                log_link_warning_errno(link, r, "Cannot disable kernel IPv6 accept_ra for interface: %m");

++                log_link_warning_errno(link, r, "Cannot configure kernel IPv6 accept_ra for interface: %m");

+ 

+         return 0;

+ }

+diff -aur systemd-228/src/network/networkd-ndisc.c systemd-228-1/src/network/networkd-ndisc.c

+--- systemd-228/src/network/networkd-ndisc.c	2015-11-17 23:59:06.000000000 -0800

+@@ -26,7 +26,7 @@

+ #include "sd-ndisc.h"

+ 

+ #include "networkd-link.h"

+-

++/*

+ static int ndisc_netlink_handler(sd_netlink *rtnl, sd_netlink_message *m, void *userdata) {

+         _cleanup_link_unref_ Link *link = userdata;

+         int r;

+@@ -77,7 +77,6 @@

+         if (in_addr_is_null(AF_INET6, (const union in_addr_union *) &link->network->ipv6_token) == 0)

+                 memcpy(((char *)&address->in_addr.in6) + 8, ((char *)&link->network->ipv6_token) + 8, 8);

+         else {

+-                /* see RFC4291 section 2.5.1 */

+                 address->in_addr.in6.__in6_u.__u6_addr8[8]  = link->mac.ether_addr_octet[0];

+                 address->in_addr.in6.__in6_u.__u6_addr8[8] ^= 1 << 1;

+                 address->in_addr.in6.__in6_u.__u6_addr8[9]  = link->mac.ether_addr_octet[1];

+@@ -140,11 +139,12 @@

+ 

+         link->ndisc_messages ++;

+ }

++*/

+ 

+ static void ndisc_router_handler(sd_ndisc *nd, uint8_t flags, const struct in6_addr *gateway, unsigned lifetime, int pref, void *userdata) {

+         _cleanup_route_free_ Route *route = NULL;

+         Link *link = userdata;

+-        usec_t time_now;

++        /* usec_t time_now; */

+         int r;

+ 

+         assert(link);

+@@ -163,6 +163,8 @@

+                         log_link_warning_errno(link, r, "Starting DHCPv6 client on NDisc request failed: %m");

+         }

+ 

++        return;

++/*

+         if (!gateway)

+                 return;

+ 

+@@ -189,6 +191,7 @@

+         }

+ 

+         link->ndisc_messages ++;

++*/

+ }

+ 

+ static void ndisc_handler(sd_ndisc *nd, int event, void *userdata) {

+@@ -242,8 +245,8 @@

+ 

+         r = sd_ndisc_set_callback(link->ndisc_router_discovery,

+                                   ndisc_router_handler,

+-                                  ndisc_prefix_onlink_handler,

+-                                  ndisc_prefix_autonomous_handler,

++                                  NULL,

++                                  NULL,

+                                   ndisc_handler,

+                                   link);

+ 

@@ -1,7 +1,7 @@

 Summary:          Systemd-228

 Name:             systemd

 Version:          228

-Release:          19%{?dist}

+Release:          20%{?dist}

 License:          LGPLv2+ and GPLv2+ and MIT

 URL:              http://www.freedesktop.org/wiki/Software/systemd/

 Group:            System Environment/Security

@@ -20,12 +20,13 @@ Patch4:           systemd-228-parse-error-message.patch

 Patch5:           systemd-228-networking-fixes.patch

 Patch6:           systemd-228-cleanup-recv.patch

 Patch7:           systemd-228-fix-reading-routes.patch

-Patch8:           systemd-228-ipv6-disabled-fix.patch

+Patch8:           systemd-228-kernel-ndisc.patch

 Patch9:           systemd-228-swap-disconnect-order-fix.patch

 Patch10:          systemd-228-duid-iaid-dhcp-preserve.patch

 Patch11:          systemd-228-timedatectl-PR2749.patch

 Patch12:          systemd-228-query-duid.patch

 Patch13:          systemd-228-pam-systemd-user.patch

+Patch14:          systemd-228-ipv6-disabled-fix.patch

 Requires:         Linux-PAM

 Requires:         libcap

 Requires:         xz

@@ -72,6 +73,7 @@ sed -i "s:blkid/::" $(grep -rl "blkid/blkid.h")

 %patch11 -p1

 %patch12 -p1

 %patch13 -p1

+%patch14 -p1

 sed -i "s#\#DefaultTasksMax=512#DefaultTasksMax=infinity#g" src/core/system.conf

 %build

@@ -140,15 +142,17 @@ rm -rf %{buildroot}/*

 %dir %{_localstatedir}/log/journal

 %changelog

+*    Tue May 17 2016 Anish Swaminathan <anishs@vmware.com>  228-20

+-    Added patch for letting kernel handle ndisc

 *    Tue May 17 2016 Divya Thaluru <dthaluru@vmware.com> 228-19

 -    Updated systemd-user PAM configuration

-*    Mon May 12 2016 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 228-18

+*    Mon May 16 2016 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 228-18

 -    Updated the MaxTasks to infinity in system.conf file

 *    Thu Apr 21 2016 Mahmoud Bassiouny <mbassiouny@vmware.com>  228-17

 -    Set the default.target to the multi-user.target

 *    Tue Apr 12 2016 Vinay Kulkarni <kulkarniv@vmware.com>  228-16

 -    Disable network interface renaming.

-*    Wed Mar 31 2016 Vinay Kulkarni <kulkarniv@vmware.com>  228-15

+*    Thu Mar 31 2016 Vinay Kulkarni <kulkarniv@vmware.com>  228-15

 -    Patch to query DHCP DUID, IAID.f

 *    Wed Mar 30 2016 Vinay Kulkarni <kulkarniv@vmware.com>  228-14

 -    Update DHCP DUID, IAID configuration patch.