tree c5f02479ea804cd987c0d6e3ab428446e2b35caf
parent 72f15d53f3e0ca19bb5755b9cbdde000ee2f702e
author Johannes Berg <johannes.berg@intel.com> 1476274633 +0200
committer Johannes Berg <johannes.berg@intel.com> 1476274633 +0200

mac80211: preserve more bits when building QoS header

Michael Braun reported that when trying to inject A-MSDUs over
monitor interfaces, the frame doesn't come out right since the
QoS header A-MSDU bit is overwritten.

Rather than adding that bit specifically simply preserve those
bits that we don't set here, since we typically get here with
a zeroed-out QoS header anyway.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>