diff options
| author | Eliad Peller | 2011-10-05 11:56:00 +0200 |
|---|---|---|
| committer | Luciano Coelho | 2011-10-07 07:32:50 +0200 |
| commit | 252efa4f978a2901039fffc934060fb8ccf82ac7 (patch) | |
| tree | 919f33de17e038696e38a8e772438c05f2143493 /drivers/net/wireless/wl12xx/event.c | |
| parent | wl12xx: move default_key into wlvif (diff) | |
| download | kernel-qcow2-linux-252efa4f978a2901039fffc934060fb8ccf82ac7.tar.gz kernel-qcow2-linux-252efa4f978a2901039fffc934060fb8ccf82ac7.tar.xz kernel-qcow2-linux-252efa4f978a2901039fffc934060fb8ccf82ac7.zip | |
wl12xx: move pspoll_work into wlvif
move pspoll_work into the per-interface data, rather than
being global.
Signed-off-by: Eliad Peller <eliad@wizery.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>
Diffstat (limited to 'drivers/net/wireless/wl12xx/event.c')
| -rw-r--r-- | drivers/net/wireless/wl12xx/event.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/wl12xx/event.c b/drivers/net/wireless/wl12xx/event.c index 28a4396fb8e4..4e3474c11e05 100644 --- a/drivers/net/wireless/wl12xx/event.c +++ b/drivers/net/wireless/wl12xx/event.c @@ -38,9 +38,9 @@ void wl1271_pspoll_work(struct work_struct *work) int ret; dwork = container_of(work, struct delayed_work, work); - wl = container_of(dwork, struct wl1271, pspoll_work); - vif = wl->vif; /* TODO: move work into vif struct */ - wlvif = wl12xx_vif_to_data(vif); + wlvif = container_of(dwork, struct wl12xx_vif, pspoll_work); + vif = container_of((void *)wlvif, struct ieee80211_vif, drv_priv); + wl = wlvif->wl; wl1271_debug(DEBUG_EVENT, "pspoll work"); @@ -90,7 +90,7 @@ static void wl1271_event_pspoll_delivery_fail(struct wl1271 *wl, if (ret < 0) return; set_bit(WL1271_FLAG_PSPOLL_FAILURE, &wl->flags); - ieee80211_queue_delayed_work(wl->hw, &wl->pspoll_work, + ieee80211_queue_delayed_work(wl->hw, &wlvif->pspoll_work, msecs_to_jiffies(delay)); } |