]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
ipw2x00: fix rtnl mutex deadlock
authorStanislaw Gruszka <sgruszka@redhat.com>
Wed, 14 Sep 2011 14:47:50 +0000 (16:47 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 16 Sep 2011 19:32:09 +0000 (15:32 -0400)
commit7cabafcea793c003503a118da58da358b0692930
treedb6808f5e5c443f006b7a8e91c05c51248758f5d
parentaa3d7eef398dd4f29045e9889b817d5161afe03e
ipw2x00: fix rtnl mutex deadlock

This fix regression introduced by:

commit: ecb4433550f0620f3d1471ae7099037ede30a91e
Author: Stanislaw Gruszka <sgruszka@redhat.com>
Date:   Fri Aug 12 14:00:59 2011 +0200

    mac80211: fix suspend/resume races with unregister hw

Above commit add rtnl_lock() into wiphy_register(), what cause deadlock
when initializing ipw2x00 driver, which itself call wiphy_register()
from register_netdev() internal callback with rtnl mutex taken.

To fix move wiphy_register() outside register_netdev(). This solution
have side effect of not creating /sys/class/net/wlanX/phy80211 link,
but that's a minor issue we can live with.

Bisected-by: Witold Baryluk <baryluk@smp.if.uj.edu.pl>
Bisected-by: Michael Witten <mfwitten@gmail.com>
Tested-by: Witold Baryluk <baryluk@smp.if.uj.edu.pl>
Tested-by: Michael Witten <mfwitten@gmail.com>
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/ipw2x00/ipw2100.c
drivers/net/wireless/ipw2x00/ipw2200.c