Răsfoiți Sursa

mac80211: don't assume driver has been attached on registration

mac80211's ieee80211_register_hw() is often called within the
probe path so it cannot assume the device's driver structure
has been attached yet so to create a workqueue instead of
using driver->name use the wiphy's phy%d name. The name doesn't
really matter anyway.

This should fix sporadic oopses found when we race to beat the
driver pointer setting. Not even sure how this was working properly.

http://www.kerneloops.org/search.php?search=ieee80211_register_hw

Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Acked-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Luis R. Rodriguez 16 ani în urmă
părinte
comite
4ada424db1
1 a modificat fișierele cu 2 adăugiri și 3 ștergeri
  1. 2 3
      net/mac80211/main.c

+ 2 - 3
net/mac80211/main.c

@@ -722,7 +722,6 @@ EXPORT_SYMBOL(ieee80211_alloc_hw);
 int ieee80211_register_hw(struct ieee80211_hw *hw)
 int ieee80211_register_hw(struct ieee80211_hw *hw)
 {
 {
 	struct ieee80211_local *local = hw_to_local(hw);
 	struct ieee80211_local *local = hw_to_local(hw);
-	const char *name;
 	int result;
 	int result;
 	enum ieee80211_band band;
 	enum ieee80211_band band;
 	struct net_device *mdev;
 	struct net_device *mdev;
@@ -787,8 +786,8 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)
 	mdev->header_ops = &ieee80211_header_ops;
 	mdev->header_ops = &ieee80211_header_ops;
 	mdev->set_multicast_list = ieee80211_master_set_multicast_list;
 	mdev->set_multicast_list = ieee80211_master_set_multicast_list;
 
 
-	name = wiphy_dev(local->hw.wiphy)->driver->name;
-	local->hw.workqueue = create_freezeable_workqueue(name);
+	local->hw.workqueue =
+		create_freezeable_workqueue(wiphy_name(local->hw.wiphy));
 	if (!local->hw.workqueue) {
 	if (!local->hw.workqueue) {
 		result = -ENOMEM;
 		result = -ENOMEM;
 		goto fail_workqueue;
 		goto fail_workqueue;