diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-06-08 15:48:25 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-06-08 15:48:25 -0400 |
| commit | ba9b28d19a3251bb1dfe6a6f8cc89b96fb85f683 (patch) | |
| tree | d770bd8c536771cb3804abb51ed029d7dd9d30d2 /net/ieee80211/softmac/ieee80211softmac_event.c | |
| parent | 862fc81b62c2d41a7e0b97b90844c80e59c7b0f1 (diff) | |
| parent | 5c601d0c942f5aaf7f3cff7e08f61047d70a964e (diff) | |
| download | op-kernel-dev-ba9b28d19a3251bb1dfe6a6f8cc89b96fb85f683.zip op-kernel-dev-ba9b28d19a3251bb1dfe6a6f8cc89b96fb85f683.tar.gz | |
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream
Diffstat (limited to 'net/ieee80211/softmac/ieee80211softmac_event.c')
| -rw-r--r-- | net/ieee80211/softmac/ieee80211softmac_event.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/ieee80211/softmac/ieee80211softmac_event.c b/net/ieee80211/softmac/ieee80211softmac_event.c index 4b153f7..f34fa2e 100644 --- a/net/ieee80211/softmac/ieee80211softmac_event.c +++ b/net/ieee80211/softmac/ieee80211softmac_event.c @@ -78,7 +78,7 @@ ieee80211softmac_notify_callback(void *d) struct ieee80211softmac_event event = *(struct ieee80211softmac_event*) d; kfree(d); - event.fun(event.mac->dev, event.context); + event.fun(event.mac->dev, event.event_type, event.context); } int @@ -167,6 +167,9 @@ ieee80211softmac_call_events_locked(struct ieee80211softmac_device *mac, int eve if ((eventptr->event_type == event || eventptr->event_type == -1) && (eventptr->event_context == NULL || eventptr->event_context == event_ctx)) { list_del(&eventptr->list); + /* User may have subscribed to ANY event, so + * we tell them which event triggered it. */ + eventptr->event_type = event; schedule_work(&eventptr->work); } } |
