Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f9972577 authored Jan 14, 2012 by Antonio Quartulli Committed by John W. Linville Jan 24, 2012

ath5k: claim support for IBSS RSN



Disable group keys programming when using IBSS RSN. Keys will be managed using
software. In this way IBSS RSN can correctly work.

Signed-off-by: Antonio Quartulli <ordex@autistici.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent 6ae4bb66

drivers/net/wireless/ath/ath5k/base.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -2442,6 +2442,9 @@ ath5k_init_ah(struct ath5k_hw ah, const struct ath_bus_ops bus_ops)
		BIT(NL80211_IFTYPE_ADHOC) \|
		BIT(NL80211_IFTYPE_MESH_POINT);

		/* SW support for IBSS_RSN is provided by mac80211 */
		hw->wiphy->flags \|= WIPHY_FLAG_IBSS_RSN;

		/* both antennas can be configured as RX or TX */
		hw->wiphy->available_antennas_tx = 0x3;
		hw->wiphy->available_antennas_rx = 0x3;

drivers/net/wireless/ath/ath5k/mac80211-ops.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -483,6 +483,14 @@ ath5k_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
		if (ath5k_modparam_nohwcrypt)
		return -EOPNOTSUPP;

		if (vif->type == NL80211_IFTYPE_ADHOC &&
		(key->cipher == WLAN_CIPHER_SUITE_TKIP \|\|
		key->cipher == WLAN_CIPHER_SUITE_CCMP) &&
		!(key->flags & IEEE80211_KEY_FLAG_PAIRWISE)) {
		/* don't program group keys when using IBSS_RSN */
		return -EOPNOTSUPP;
		}

		switch (key->cipher) {
		case WLAN_CIPHER_SUITE_WEP40:
		case WLAN_CIPHER_SUITE_WEP104: