|
@@ -4010,6 +4010,20 @@ static int b43_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
|
|
|
if (modparam_nohwcrypt)
|
|
|
return -ENOSPC; /* User disabled HW-crypto */
|
|
|
|
|
|
+ if ((vif->type == NL80211_IFTYPE_ADHOC ||
|
|
|
+ vif->type == NL80211_IFTYPE_MESH_POINT) &&
|
|
|
+ (key->cipher == WLAN_CIPHER_SUITE_TKIP ||
|
|
|
+ key->cipher == WLAN_CIPHER_SUITE_CCMP) &&
|
|
|
+ !(key->flags & IEEE80211_KEY_FLAG_PAIRWISE)) {
|
|
|
+ /*
|
|
|
+ * For now, disable hw crypto for the RSN IBSS group keys. This
|
|
|
+ * could be optimized in the future, but until that gets
|
|
|
+ * implemented, use of software crypto for group addressed
|
|
|
+ * frames is a acceptable to allow RSN IBSS to be used.
|
|
|
+ */
|
|
|
+ return -EOPNOTSUPP;
|
|
|
+ }
|
|
|
+
|
|
|
mutex_lock(&wl->mutex);
|
|
|
|
|
|
dev = wl->current_dev;
|
|
@@ -5275,6 +5289,8 @@ static struct b43_wl *b43_wireless_init(struct b43_bus_dev *dev)
|
|
|
BIT(NL80211_IFTYPE_WDS) |
|
|
|
BIT(NL80211_IFTYPE_ADHOC);
|
|
|
|
|
|
+ hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN;
|
|
|
+
|
|
|
hw->queues = modparam_qos ? B43_QOS_QUEUE_NUM : 1;
|
|
|
wl->mac80211_initially_registered_queues = hw->queues;
|
|
|
hw->max_rates = 2;
|