wifi: Merge fix #1