Merge ath-next from ath.git

Major changes:

ath9k

* add random number generator support (CONFIG_ATH9K_HWRNG)
This commit is contained in:
Kalle Valo
2015-12-16 16:28:20 +02:00
25 changed files with 422 additions and 225 deletions

View File

@@ -250,7 +250,8 @@ static int ath10k_install_peer_wep_keys(struct ath10k_vif *arvif,
lockdep_assert_held(&ar->conf_mutex);
if (WARN_ON(arvif->vif->type != NL80211_IFTYPE_AP &&
arvif->vif->type != NL80211_IFTYPE_ADHOC))
arvif->vif->type != NL80211_IFTYPE_ADHOC &&
arvif->vif->type != NL80211_IFTYPE_MESH_POINT))
return -EINVAL;
spin_lock_bh(&ar->data_lock);