From c28e90402c60fe10de4a99f4bd3e0c94607367d1 Mon Sep 17 00:00:00 2001 From: Ivo van Doorn Date: Sun, 2 Nov 2008 00:37:25 +0100 Subject: [PATCH] --- yaml --- r: 121997 b: refs/heads/master c: 8058409c4fb8e38632207d572ed29943d2585520 h: refs/heads/master i: 121995: 613647d9b29723c572bbba27d43e2911bbb1bb14 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/rt2x00/rt2x00mac.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a221a1a19e5d..d86a71285eba 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9a95dba32735534bda59def40c747bf606fedf05 +refs/heads/master: 8058409c4fb8e38632207d572ed29943d2585520 diff --git a/trunk/drivers/net/wireless/rt2x00/rt2x00mac.c b/trunk/drivers/net/wireless/rt2x00/rt2x00mac.c index 8fc2315c5963..188f89177bd8 100644 --- a/trunk/drivers/net/wireless/rt2x00/rt2x00mac.c +++ b/trunk/drivers/net/wireless/rt2x00/rt2x00mac.c @@ -486,7 +486,9 @@ int rt2x00mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, struct ieee80211_key_conf *key); struct rt2x00lib_crypto crypto; - if (!test_bit(CONFIG_SUPPORT_HW_CRYPTO, &rt2x00dev->flags)) + if (!test_bit(DEVICE_STATE_PRESENT, &rt2x00dev->flags)) + return 0; + else if (!test_bit(CONFIG_SUPPORT_HW_CRYPTO, &rt2x00dev->flags)) return -EOPNOTSUPP; else if (key->keylen > 32) return -ENOSPC;