From fe49a5996ecb9a567ec7eebd83dace783b2852be Mon Sep 17 00:00:00 2001 From: Vasanthakumar Thiagarajan Date: Tue, 14 Feb 2012 20:33:00 +0530 Subject: [PATCH] --- yaml --- r: 291455 b: refs/heads/master c: cc4d623de46616825d9330467e0a7375835171be h: refs/heads/master i: 291453: 9f34cc2cf615d053414a6df9f11535c2d7948cee 291451: 1542c6e6434ab3f1be1f328d1b99a644e8d22a40 291447: 919847d1c984b7ee7aa40154d85b471d11d79708 291439: c261c4aa3ac465c14dcd65d67c96c818e019eedc 291423: 19cd34d84261c7085a5b68ec71b3c73d95748cd0 291391: b9e58ebc00fd4018f4205debf3300080ded4178c 291327: a10edc517bd4b58ecca8c9f5059cad7a14ea0f5d v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 606c7db90464..d362189c8592 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e8ad9a0638cb50dad48201f461f4739740f036b3 +refs/heads/master: cc4d623de46616825d9330467e0a7375835171be diff --git a/trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c b/trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c index 86879896b1ab..a47688054ce9 100644 --- a/trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c +++ b/trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c @@ -1059,7 +1059,7 @@ static int ath6kl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *ndev, if (vif->nw_type == AP_NETWORK && !pairwise && (key_type == TKIP_CRYPT || key_type == AES_CRYPT || - key_type == WAPI_CRYPT) && params) { + key_type == WAPI_CRYPT)) { ar->ap_mode_bkey.valid = true; ar->ap_mode_bkey.key_index = key_index; ar->ap_mode_bkey.key_type = key_type;