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

Commit 3eadf5f4 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

mac80211: fix initialisation error path 



The error handling in ieee80211_init() is broken when any of
the built-in rate control algorithms fail to initialise, fix
it and rename the error labels.

Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f0b9205c

net/mac80211/ieee80211.c

+7 −7
Original line number Diff line number Diff line
@@ -1344,17 +1344,17 @@ static int __init ieee80211_init(void) 


	ret = rc80211_simple_init();

	if (ret)

		goto fail;

		goto out;



	ret = rc80211_pid_init();

	if (ret)

		goto fail_simple;

		goto out_cleanup_simple;



	ret = ieee80211_wme_register();

	if (ret) {

		printk(KERN_DEBUG "ieee80211_init: failed to "

		       "initialize WME (err=%d)\n", ret);

		goto fail_pid;

		goto out_cleanup_pid;

	}



	ieee80211_debugfs_netdev_init();
@@ -1362,11 +1362,11 @@ static int __init ieee80211_init(void) 


	return 0;



 fail_pid:

	rc80211_simple_exit();

 fail_simple:

 out_cleanup_pid:

	rc80211_pid_exit();

 fail:

 out_cleanup_simple:

	rc80211_simple_exit();

 out:

	return ret;

}