Commit 66c524210ab9217528b01b63c43903545e03a58c
Committed by
John W. Linville
1 parent
f9f9b6e3e3
Exists in
master
and in
7 other branches
mac80211: remove bogus rcu_read_lock()
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>
Showing 1 changed file with 1 additions and 6 deletions Side-by-side Diff
net/mac80211/cfg.c
... | ... | @@ -324,14 +324,9 @@ |
324 | 324 | struct net_device *dev, |
325 | 325 | u8 key_idx) |
326 | 326 | { |
327 | - struct ieee80211_sub_if_data *sdata; | |
327 | + struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); | |
328 | 328 | |
329 | - rcu_read_lock(); | |
330 | - | |
331 | - sdata = IEEE80211_DEV_TO_SUB_IF(dev); | |
332 | 329 | ieee80211_set_default_mgmt_key(sdata, key_idx); |
333 | - | |
334 | - rcu_read_unlock(); | |
335 | 330 | |
336 | 331 | return 0; |
337 | 332 | } |