struct set_ip_addr ip_info;
        struct drv_handler drv;
        struct set_multicast multicast_info;
-       struct op_mode strHostIfSetOperationMode;
+       struct op_mode mode;
        struct set_mac_addr strHostIfSetMacAddress;
        struct get_mac_addr strHostIfGetMacAddress;
        struct ba_session_info strHostIfBASessionInfo;
                        break;
 
                case HOST_IF_MSG_SET_OPERATION_MODE:
-                       Handle_SetOperationMode(msg.drvHandler, &msg.body.strHostIfSetOperationMode);
+                       Handle_SetOperationMode(msg.drvHandler, &msg.body.mode);
                        break;
 
                case HOST_IF_MSG_SET_IPADDRESS:
 
        memset(&msg, 0, sizeof(struct host_if_msg));
        msg.id = HOST_IF_MSG_SET_OPERATION_MODE;
-       msg.body.strHostIfSetOperationMode.u32Mode = u32mode;
+       msg.body.mode.u32Mode = u32mode;
        msg.drvHandler = hWFIDrv;
 
        s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));