]> git.karo-electronics.de Git - mv-sheeva.git/commit
iwlwifi: use proper short slot/preamble settings
authorJohannes Berg <johannes.berg@intel.com>
Thu, 6 May 2010 19:21:40 +0000 (12:21 -0700)
committerReinette Chatre <reinette.chatre@intel.com>
Thu, 13 May 2010 17:45:24 +0000 (10:45 -0700)
commitc213d745b25b24b68f790fe55fc0a2159218a079
tree0167dab957cdea2fde74386410cd74ec7ec6c803
parentd73e4923d1b3311dda4cd1bd5d3596d75af1d1c3
iwlwifi: use proper short slot/preamble settings

The short preamble setting might change on the
fly, and then we already use the right mac80211
variable. However, in other places we don't,
which is especially wrong in the AP code since
in that case the assoc_capability is invalid.
Also, the IBSS special case is not needed since
"use_short_slot" will be properly cleared, but
the "assoc_capability" might be invalid (which
must be the reason for the special case).

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/iwlwifi/iwl-core.c
drivers/net/wireless/iwlwifi/iwl3945-base.c