Skip to content

Commit

Permalink
mac80211: remove bogus rcu_read_lock()
Browse files Browse the repository at this point in the history
Another remnant of the previous key locking scheme
needs to be removed -- this causes a warning
otherwise as ieee80211_set_default_mgmt_key will
acquire a mutex.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Johannes Berg authored and John W. Linville committed Jul 26, 2010
1 parent f9f9b6e commit 66c5242
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions net/mac80211/cfg.c
Original file line number Diff line number Diff line change
Expand Up @@ -324,15 +324,10 @@ static int ieee80211_config_default_mgmt_key(struct wiphy *wiphy,
struct net_device *dev,
u8 key_idx)
{
struct ieee80211_sub_if_data *sdata;

rcu_read_lock();
struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);

sdata = IEEE80211_DEV_TO_SUB_IF(dev);
ieee80211_set_default_mgmt_key(sdata, key_idx);

rcu_read_unlock();

return 0;
}

Expand Down

0 comments on commit 66c5242

Please sign in to comment.