summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2010-05-24 13:36:37 -0400
committerJohn W. Linville <linville@tuxdriver.com>2010-05-24 14:59:27 -0400
commit3dc3fc52ea1537f5f37ab301d2b1468a0e79988f (patch)
tree1d958b8f26d09c26ff4e3b05c4126e75c8f799da /net
parent617f3d0d71e2eae4d8d475cefe9363b140e52083 (diff)
downloadlinux-3.10-3dc3fc52ea1537f5f37ab301d2b1468a0e79988f.tar.gz
linux-3.10-3dc3fc52ea1537f5f37ab301d2b1468a0e79988f.tar.bz2
linux-3.10-3dc3fc52ea1537f5f37ab301d2b1468a0e79988f.zip
Revert "ath9k: Group Key fix for VAPs"
This reverts commit 03ceedea972a82d343fa5c2528b3952fa9e615d5. This patch was reported to cause a regression in which connectivity is lost and cannot be reestablished after a suspend/resume cycle. Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/key.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/mac80211/key.c b/net/mac80211/key.c
index 8d4b41787dc..e8f6e3b252d 100644
--- a/net/mac80211/key.c
+++ b/net/mac80211/key.c
@@ -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) {