Skip to content

Commit

Permalink
mac80211: fix update_tkip_key() documentation about the context
Browse files Browse the repository at this point in the history
Johannes noticed that I had incorrectly documented the context of
update_tkip_key() driver operation. It must be atomic because all
RX code is run inside rcu critical section.

Reported-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Kalle Valo <kalle.valo@iki.fi>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Kalle Valo authored and John W. Linville committed Jan 25, 2010
1 parent 96869a3 commit eb807fb
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
2 changes: 1 addition & 1 deletion include/net/mac80211.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions net/mac80211/driver-ops.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit eb807fb

Please sign in to comment.