Commit a69eee49 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Revert "ath9k: Group Key fix for VAPs" 



This reverts commit 03ceedea, since it
breaks resume from suspend-to-ram on Rafael's Acer Ferrari One.
NetworkManager thinks everything is ok, but it can't connect to the AP
to get an IP address after the resume.

In fact, it even breaks resume for non-ath9k chipsets: reverting it also
fixes Rafael's Toshiba Protege R500 with the iwlagn driver.  As Johannes
says:

  "Indeed, this patch needs to be reverted. That mac80211 change is wrong
   and completely unnecessary."

Reported-and-requested-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Acked-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Cc: Daniel Yingqiang Ma <yma.cool@gmail.com>
Cc: John W. Linville <linville@tuxdriver.com>
Cc: David Miller <davem@davemloft.net>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 3e766fd4

drivers/net/wireless/ath/ath9k/main.c

+3 −25
Original line number Diff line number Diff line
@@ -752,7 +752,6 @@ static int ath_key_config(struct ath_common *common, 
	struct ath_hw *ah = common->ah;

	struct ath9k_keyval hk;

	const u8 *mac = NULL;

	u8 gmac[ETH_ALEN];

	int ret = 0;

	int idx;
@@ -776,30 +775,9 @@ static int ath_key_config(struct ath_common *common, 
	memcpy(hk.kv_val, key->key, key->keylen);



	if (!(key->flags & IEEE80211_KEY_FLAG_PAIRWISE)) {



		if (key->ap_addr) {

			/*

			 * Group keys on hardware that supports multicast frame

			 * key search use a mac that is the sender's address with

			 * the high bit set instead of the app-specified address.

			 */

			memcpy(gmac, key->ap_addr, ETH_ALEN);

			gmac[0] |= 0x80;

			mac = gmac;



			if (key->alg == ALG_TKIP)

				idx = ath_reserve_key_cache_slot_tkip(common);

			else

				idx = ath_reserve_key_cache_slot(common);

			if (idx < 0)

				mac = NULL; /* no free key cache entries */

		}



		if (!mac) {

		/* For now, use the default keys for broadcast keys. This may

		 * need to change with virtual interfaces. */

		idx = key->keyidx;

		}

	} else if (key->keyidx) {

		if (WARN_ON(!sta))

			return -EOPNOTSUPP;

include/net/mac80211.h

+0 −1
Original line number Diff line number Diff line
@@ -831,7 +831,6 @@ struct ieee80211_key_conf { 
	u8 iv_len;

	u8 hw_key_idx;

	u8 flags;

	u8 *ap_addr;

	s8 keyidx;

	u8 keylen;

	u8 key[0];

net/mac80211/key.c

+0 −1
Original line number Diff line number Diff line
@@ -140,7 +140,6 @@ static void ieee80211_key_enable_hw_accel(struct ieee80211_key *key) 
				     struct ieee80211_sub_if_data,

				     u.ap);



	key->conf.ap_addr = sdata->dev->dev_addr;

	ret = drv_set_key(key->local, SET_KEY, sdata, sta, &key->conf);



	if (!ret) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE