In preparation for another wrinkle around switching into IBSS mode, refactor existing mode switch logic for simplicity at the expense of some brevity. Signed-off-by: Christopher Wiley <wiley@chromium.org>