atheros: v3.18: rearrange code between patches