On Wed, 23 Jul 2008, Ivo van Doorn wrote: > > --- a/net/rfkill/rfkill-input.c > > +++ b/net/rfkill/rfkill-input.c > > @@ -47,6 +47,8 @@ struct rfkill_task { > > enum rfkill_global_sched_op { > > RFKILL_GLOBAL_OP_EPO = 0, > > RFKILL_GLOBAL_OP_RESTORE, > > + RFKILL_GLOBAL_OP_UNLOCK, > > + RFKILL_GLOBAL_OP_UNBLOCK, > > }; > > As mentioned in the previous patch "rfkill: add master_switch_mode functionality" > the above 2 new enums aren't allowed because they are blocked in the module > init function. Hmm? The GLOBAL_OP are internal stuff for the driver, and master_switch_mode=2 does work, I did test :) I will reread the code and reply to you on the previous patch. > > static void rfkill_schedule_toggle(struct rfkill_task *task) > > { > > unsigned long flags; > > @@ -169,30 +161,19 @@ static DEFINE_RFKILL_TASK(rfkill_wlan, RFKILL_TYPE_WLAN); > > static DEFINE_RFKILL_TASK(rfkill_bt, RFKILL_TYPE_BLUETOOTH); > > static DEFINE_RFKILL_TASK(rfkill_uwb, RFKILL_TYPE_UWB); > > static DEFINE_RFKILL_TASK(rfkill_wimax, RFKILL_TYPE_WIMAX); > > -static DEFINE_RFKILL_TASK(rfkill_wwan, RFKILL_TYPE_WWAN); > > Are all RFKILL_TYPE_WWAN users gone? > In that case the define should disappear completely. No, we do have users of WWAN. Thinkpad-acpi for one. What we don't have is any specific KEY_WWAN or SW_WWAN event, so rfkill-input doesn't need to special case it like it does for the others. And the new RFKILL_ALL/EPO code handles every switch type in a single for() loop, so I didn't need to special-case it anymore. I didn't add a KEY_WWAN because I don't know exactly of anyone who needs it (thinkpads actually want a KEY_WIRELESS that is used to cycle through various states for WLAN, WWAN, BLUETOOTH and UWB, or to bring up a GUI or somesuch). However, if you guys think it is best, we can certainly ask Dmitry for KEY_WWAN and add it to rfkill-input. Anyone with a laptop with a UMTS/EDGE/GPRS radio might want to map one of his keys to that keycode and have rfkill-input handle it. Unfortunately, we can't share KEY_WIMAX. We could DROP KEY_WIMAX in favor of KEY_WWAN and have rfkill-input handle KEY_WWAN as both a WiMAX and WWAN event (WiMAX is actually an element of the WWAN set)... but the proper fix for that is a bit more complicated (add superclasses/groups, make WWAN a superclass and add WIMAX inside it, make WLAN a superclass, create a WPAN superclass with bluetooth and UWB inside it) and I really don't feel like coding that one right now :( rfkill-input really would benefit from that, user-interface wise, as we usually want to rfkill an entire set of devices regardless of their "technology". -- "One disk to rule them all, One disk to find them. One disk to bring them all and in the darkness grind them. In the Land of Redmond where the shadows lie." -- The Silicon Valley Tarot Henrique Holschuh -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html