From patchwork Sun Jan 24 12:55:12 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kalle Valo X-Patchwork-Id: 74986 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id o0OCtOhv016516 for ; Sun, 24 Jan 2010 12:55:24 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753625Ab0AXMzU (ORCPT ); Sun, 24 Jan 2010 07:55:20 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753743Ab0AXMzT (ORCPT ); Sun, 24 Jan 2010 07:55:19 -0500 Received: from emh05.mail.saunalahti.fi ([62.142.5.111]:32921 "EHLO emh05.mail.saunalahti.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750918Ab0AXMzS (ORCPT ); Sun, 24 Jan 2010 07:55:18 -0500 Received: from saunalahti-vams (vs3-10.mail.saunalahti.fi [62.142.5.94]) by emh05-2.mail.saunalahti.fi (Postfix) with SMTP id DEF258BF27; Sun, 24 Jan 2010 14:55:16 +0200 (EET) Received: from emh07.mail.saunalahti.fi ([62.142.5.117]) by vs3-10.mail.saunalahti.fi ([62.142.5.94]) with SMTP (gateway) id A0669ADC977; Sun, 24 Jan 2010 14:55:16 +0200 Received: from [127.0.1.1] (a91-155-131-184.elisa-laajakaista.fi [91.155.131.184]) by emh07.mail.saunalahti.fi (Postfix) with ESMTP id C5FE91C638B; Sun, 24 Jan 2010 14:55:14 +0200 (EET) Subject: [PATCH] mac80211: fix update_tkip_key() documentation about the context To: linux-wireless@vger.kernel.org From: Kalle Valo Cc: Johannes Berg Date: Sun, 24 Jan 2010 14:55:12 +0200 Message-ID: <20100124125512.14746.63093.stgit@tikku> User-Agent: StGit/0.15 MIME-Version: 1.0 X-Antivirus: VAMS Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org diff --git a/include/net/mac80211.h b/include/net/mac80211.h index f56d6f4..f64402f 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h @@ -1489,7 +1489,7 @@ enum ieee80211_ampdu_mlme_action { * @update_tkip_key: See the section "Hardware crypto acceleration" * This callback will be called in the context of Rx. Called for drivers * which set IEEE80211_KEY_FLAG_TKIP_REQ_RX_P1_KEY. - * The callback can sleep. + * The callback must be atomic. * * @hw_scan: Ask the hardware to service the scan request, no need to start * the scan state machine in stack. The scan must honour the channel diff --git a/net/mac80211/driver-ops.h b/net/mac80211/driver-ops.h index 40c6e9a..6c31f38 100644 --- a/net/mac80211/driver-ops.h +++ b/net/mac80211/driver-ops.h @@ -144,8 +144,6 @@ static inline void drv_update_tkip_key(struct ieee80211_local *local, { struct ieee80211_sta *ista = NULL; - might_sleep(); - if (sta) ista = &sta->sta;