--- a/master/fsm_master.c	Wed Feb 27 11:29:08 2008 +0000
+++ b/master/fsm_master.c	Wed Feb 27 15:24:00 2008 +0000
@@ -503,7 +503,7 @@
 
         // check, if slaves have an Sdo dictionary to read out.
         list_for_each_entry(slave, &master->slaves, list) {
-            if (!(slave->sii_mailbox_protocols & EC_MBOX_COE)
+            if (!(slave->sii.mailbox_protocols & EC_MBOX_COE)
                 || slave->sdo_dictionary_fetched
                 || slave->current_state == EC_SLAVE_STATE_INIT
                 || jiffies - slave->jiffies_preop < EC_WAIT_SDO_DICT * HZ
@@ -673,7 +673,7 @@
         return;
     }
 
-    if (EC_READ_U32(fsm->fsm_sii.value) != slave->sii_vendor_id) {
+    if (EC_READ_U32(fsm->fsm_sii.value) != slave->sii.vendor_id) {
         EC_ERR("Slave %i has an invalid vendor ID!\n", slave->ring_position);
         fsm->state = ec_fsm_master_state_error;
         return;
@@ -738,9 +738,9 @@
         return;
     }
 
-    if (EC_READ_U32(fsm->fsm_sii.value) != slave->sii_product_code) {
+    if (EC_READ_U32(fsm->fsm_sii.value) != slave->sii.product_code) {
         EC_ERR("Slave %i: invalid product code!\n", slave->ring_position);
-        EC_ERR("expected 0x%08X, got 0x%08X.\n", slave->sii_product_code,
+        EC_ERR("expected 0x%08X, got 0x%08X.\n", slave->sii.product_code,
                EC_READ_U32(fsm->fsm_sii.value));
         fsm->state = ec_fsm_master_state_error;
         return;
@@ -865,7 +865,7 @@
         return;
 
 #ifdef EC_EOE
-    if (slave->sii_mailbox_protocols & EC_MBOX_EOE) {
+    if (slave->sii.mailbox_protocols & EC_MBOX_EOE) {
         // create EoE handler for this slave
         ec_eoe_t *eoe;
         if (!(eoe = kmalloc(sizeof(ec_eoe_t), GFP_KERNEL))) {