b43: merge ad-hoc beacon fix (backport of r28258)