Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4ada424d authored by Luis R. Rodriguez's avatar Luis R. Rodriguez Committed by John W. Linville
Browse files

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: default avatarLuis R. Rodriguez <lrodriguez@atheros.com>
Acked-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 4d3601b2

net/mac80211/main.c

+2 −3
Original line number Diff line number Diff line
@@ -722,7 +722,6 @@ EXPORT_SYMBOL(ieee80211_alloc_hw); 
int ieee80211_register_hw(struct ieee80211_hw *hw)

{

	struct ieee80211_local *local = hw_to_local(hw);

	const char *name;

	int result;

	enum ieee80211_band band;

	struct net_device *mdev;
@@ -787,8 +786,8 @@ int ieee80211_register_hw(struct ieee80211_hw *hw) 
	mdev->header_ops = &ieee80211_header_ops;

	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) {

		result = -ENOMEM;

		goto fail_workqueue;