b780f86455
Note: I manually had to merge this; I merged in the "put beacon_offsets into vap" commit before this. Submitted by: <s3erios@gmail.com> Differential Revision: https://reviews.freebsd.org/D3628