# HG changeset patch
# User Edouard Tisserant <edouard.tisserant@gmail.com>
# Date 1538924742 -7200
# Node ID e008dc9d8c9fc8dccc42e93fb1197778e8f867ae
# Parent  5e5bec5ee9c16ed1735c2328bc8f37c390eaf2ed# Parent  b4a109b9e2a8308a46fd8151b8f85ab119620786
merged

diff -r 5e5bec5ee9c1 -r e008dc9d8c9f configure.ac
--- a/configure.ac	Fri Oct 05 23:47:07 2018 +0200
+++ b/configure.ac	Sun Oct 07 17:05:42 2018 +0200
@@ -1081,7 +1081,7 @@
 
 AC_ARG_ENABLE([sii-assign],
     AS_HELP_STRING([--enable-sii-assign],
-                   [Enable SII assignment to PDI (default: no)]),
+                   [Enable SII assignment to PDI (default: yes)]),
     [
         case "${enableval}" in
             yes) siiassign=1
@@ -1092,7 +1092,7 @@
                 ;;
         esac
     ],
-    [siiassign=0]
+    [siiassign=1]
 )
 
 if test "x${siiassign}" = "x1"; then
diff -r 5e5bec5ee9c1 -r e008dc9d8c9f devices/igb/igb_main-3.18-ethercat.c
--- a/devices/igb/igb_main-3.18-ethercat.c	Fri Oct 05 23:47:07 2018 +0200
+++ b/devices/igb/igb_main-3.18-ethercat.c	Sun Oct 07 17:05:42 2018 +0200
@@ -6798,6 +6798,7 @@
 			page_address(rx_buffer->page) + rx_buffer->page_offset;
 		unsigned int size = le16_to_cpu(rx_desc->wb.upper.length);
 		ecdev_receive(adapter->ecdev, va, size);
+		adapter->ec_watchdog_jiffies = jiffies;
 		igb_reuse_rx_page(rx_ring, rx_buffer);
 	}
 	else {