> +#define IB_DEFAULT_SERVICE_LEASE 0xFFFFFFFF This doesn't seem to be used anywhere? > + /* u16 resv; */ Can we just delete this comment? > + query->sa_query.callback = ib_sa_service_rec_callback; This should probably handle a consumer passing in a NULL callback like this other query functions do. - R.