From: Johannes Berg <johannes.berg@intel.com>
Date: Thu, 8 Mar 2012 14:02:05 +0000 (+0100)
Subject: mac80211: simplify wmm check during association
X-Git-Tag: v3.4-rc1~177^2~48^2~59
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=76f0303d61b3c7f1918ab63a64e77450a4418a60;p=pandora-kernel.git

mac80211: simplify wmm check during association

Instead of setting assoc_data->wmm_used solely
based on the BSS also take into account our own
capabilities and later check those.

Also rename "wmm_used" and "uapsd_used" to just
"wmm" and "uapsd".

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

Reading git-diff-tree failed