mac80211: brcmfmac: backport changes from 2016-06-29