diff options
| author | Emmanuel Grumbach | 2013-02-10 12:07:08 +0100 |
|---|---|---|
| committer | Johannes Berg | 2013-02-11 11:56:41 +0100 |
| commit | a3777e0fdd4abb2f04202580c236d64ecdaac6f2 (patch) | |
| tree | 541d069c517a7298c32179b610e9968866c19770 /drivers/net/wireless/iwlwifi/mvm/d3.c | |
| parent | iwlwifi: mvm: fix TKIP key updating (diff) | |
| download | kernel-qcow2-linux-a3777e0fdd4abb2f04202580c236d64ecdaac6f2.tar.gz kernel-qcow2-linux-a3777e0fdd4abb2f04202580c236d64ecdaac6f2.tar.xz kernel-qcow2-linux-a3777e0fdd4abb2f04202580c236d64ecdaac6f2.zip | |
iwlwifi: mvm: fix locking in iwl_mvm_ipv6_addr_change
inet6_dev->lock can be taken from a timer. Disabled bottom
halves when we take it.
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/d3.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/d3.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/d3.c b/drivers/net/wireless/iwlwifi/mvm/d3.c index 9a95c374990d..5b2c675a8752 100644 --- a/drivers/net/wireless/iwlwifi/mvm/d3.c +++ b/drivers/net/wireless/iwlwifi/mvm/d3.c @@ -97,14 +97,14 @@ void iwl_mvm_ipv6_addr_change(struct ieee80211_hw *hw, struct inet6_ifaddr *ifa; int idx = 0; - read_lock(&idev->lock); + read_lock_bh(&idev->lock); list_for_each_entry(ifa, &idev->addr_list, if_list) { mvmvif->target_ipv6_addrs[idx] = ifa->addr; idx++; if (idx >= IWL_PROTO_OFFLOAD_NUM_IPV6_ADDRS) break; } - read_unlock(&idev->lock); + read_unlock_bh(&idev->lock); mvmvif->num_target_ipv6_addrs = idx; } |