misc wifi updates from the 3.10 repo (very little things)