The Timeout Interval element needs to use Association Comeback time for the case when (Re)Association Response frame uses Status Code 30. Verify this before incrementing the (re)assocresp_comeback counters.