projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
[linux-drm-fsl-dcu.git]
/
net
/
mac80211
/
main.c
diff --git
a/net/mac80211/main.c
b/net/mac80211/main.c
index 8eae74ac4e1ecab21b8b8e7372c18e6a5299eaf1..091088ac7890a9c7f873f623f7789cffb9e12def 100644
(file)
--- a/
net/mac80211/main.c
+++ b/
net/mac80211/main.c
@@
-331,7
+331,7
@@
static int ieee80211_ifa_changed(struct notifier_block *nb,
return NOTIFY_DONE;
ifmgd = &sdata->u.mgd;
return NOTIFY_DONE;
ifmgd = &sdata->u.mgd;
-
mutex_lock(&ifmgd->mtx
);
+
sdata_lock(sdata
);
/* Copy the addresses to the bss_conf list */
ifa = idev->ifa_list;
/* Copy the addresses to the bss_conf list */
ifa = idev->ifa_list;
@@
-349,7
+349,7
@@
static int ieee80211_ifa_changed(struct notifier_block *nb,
ieee80211_bss_info_change_notify(sdata,
BSS_CHANGED_ARP_FILTER);
ieee80211_bss_info_change_notify(sdata,
BSS_CHANGED_ARP_FILTER);
-
mutex_unlock(&ifmgd->mtx
);
+
sdata_unlock(sdata
);
return NOTIFY_DONE;
}
return NOTIFY_DONE;
}
@@
-686,8
+686,7
@@
int ieee80211_register_hw(struct ieee80211_hw *hw)
return -EINVAL;
#ifdef CONFIG_PM
return -EINVAL;
#ifdef CONFIG_PM
- if ((hw->wiphy->wowlan.flags || hw->wiphy->wowlan.n_patterns) &&
- (!local->ops->suspend || !local->ops->resume))
+ if (hw->wiphy->wowlan && (!local->ops->suspend || !local->ops->resume))
return -EINVAL;
#endif
return -EINVAL;
#endif