Preparation

These patches just a preparation for config_bss/sta refactoring