Rename stp_f to stp_l2f_h, and use it for CAC reporting