rfkill: rewrite
This patch completely rewrites the rfkill core to address the following deficiencies: * all rfkill drivers need to implement polling where necessary rather than having one central implementation * updating the rfkill state cannot be done from arbitrary contexts, forcing drivers to use schedule_work and requiring lots of code * rfkill drivers need to keep track of soft/hard blocked internally -- the core should do this * the rfkill API has many unexpected quirks, for example being asymmetric wrt. alloc/free and register/unregister * rfkill can call back into a driver from within a function the driver called -- this is prone to deadlocks and generally should be avoided * rfkill-input pointlessly is a separate module * drivers need to #ifdef rfkill functions (unless they want to depend on or select RFKILL) -- rfkill should provide inlines that do nothing if it isn't compiled in * the rfkill structure is not opaque -- drivers need to initialise it correctly (lots of sanity checking code required) -- instead force drivers to pass the right variables to rfkill_alloc() * the documentation is hard to read because it always assumes the reader is completely clueless and contains way TOO MANY CAPS * the rfkill code needlessly uses a lot of locks and atomic operations in locked sections * fix LED trigger to actually change the LED when the radio state changes -- this wasn't done before Tested-by: Alan Jenkins <alan-jenkins@tuffmail.co.uk> Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br> [thinkpad] Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:

committed by
John W. Linville

parent
0f6399c4c5
commit
19d337dff9
@@ -84,7 +84,7 @@ int b43_phy_init(struct b43_wldev *dev)
|
||||
|
||||
phy->channel = ops->get_default_chan(dev);
|
||||
|
||||
ops->software_rfkill(dev, RFKILL_STATE_UNBLOCKED);
|
||||
ops->software_rfkill(dev, false);
|
||||
err = ops->init(dev);
|
||||
if (err) {
|
||||
b43err(dev->wl, "PHY init failed\n");
|
||||
@@ -104,7 +104,7 @@ err_phy_exit:
|
||||
if (ops->exit)
|
||||
ops->exit(dev);
|
||||
err_block_rf:
|
||||
ops->software_rfkill(dev, RFKILL_STATE_SOFT_BLOCKED);
|
||||
ops->software_rfkill(dev, true);
|
||||
|
||||
return err;
|
||||
}
|
||||
@@ -113,7 +113,7 @@ void b43_phy_exit(struct b43_wldev *dev)
|
||||
{
|
||||
const struct b43_phy_operations *ops = dev->phy.ops;
|
||||
|
||||
ops->software_rfkill(dev, RFKILL_STATE_SOFT_BLOCKED);
|
||||
ops->software_rfkill(dev, true);
|
||||
if (ops->exit)
|
||||
ops->exit(dev);
|
||||
}
|
||||
@@ -295,18 +295,13 @@ err_restore_cookie:
|
||||
return err;
|
||||
}
|
||||
|
||||
void b43_software_rfkill(struct b43_wldev *dev, enum rfkill_state state)
|
||||
void b43_software_rfkill(struct b43_wldev *dev, bool blocked)
|
||||
{
|
||||
struct b43_phy *phy = &dev->phy;
|
||||
|
||||
if (state == RFKILL_STATE_HARD_BLOCKED) {
|
||||
/* We cannot hardware-block the device */
|
||||
state = RFKILL_STATE_SOFT_BLOCKED;
|
||||
}
|
||||
|
||||
b43_mac_suspend(dev);
|
||||
phy->ops->software_rfkill(dev, state);
|
||||
phy->radio_on = (state == RFKILL_STATE_UNBLOCKED);
|
||||
phy->ops->software_rfkill(dev, blocked);
|
||||
phy->radio_on = !blocked;
|
||||
b43_mac_enable(dev);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user