diff options
| author | David S. Miller <davem@davemloft.net> | 2016-04-11 15:58:12 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-04-11 15:58:12 (GMT) |
| commit | bddf59046d804638d998f9015246d4990f1cab09 (patch) | |
| tree | 63915173bab44df8515896d56f378dddfd8d1fae /drivers/net/wireless/ti/wlcore/ps.c | |
| parent | 4923ec0b10d998349c2ac4b38aa4674e539e6f92 (diff) | |
| parent | 20ac1b325d8d526211b1276ecf9b64b7e8369f50 (diff) | |
| download | linux-bddf59046d804638d998f9015246d4990f1cab09.tar.xz | |
Merge tag 'wireless-drivers-next-for-davem-2016-04-11' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next
Kalle Valo says:
====================
wireless-drivers patches for 4.7
Major changes:
iwlwifi
* support for Link Quality measurement
* more work 9000 devices and MSIx
* continuation of the Dynamic Queue Allocation work
* make the paging less memory hungry
* 9000 new Rx path
* removal of IWLWIFI_UAPSD Kconfig option
ath10k
* implement push-pull tx model using mac80211 software queuing support
* enable scan in AP mode (NL80211_FEATURE_AP_SCAN)
wil6210
* add basic PBSS (Personal Basic Service Set) support
* add initial P2P support
* add oob_mode module parameter
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/ti/wlcore/ps.c')
| -rw-r--r-- | drivers/net/wireless/ti/wlcore/ps.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ti/wlcore/ps.c b/drivers/net/wireless/ti/wlcore/ps.c index 4cd316e..d4420da 100644 --- a/drivers/net/wireless/ti/wlcore/ps.c +++ b/drivers/net/wireless/ti/wlcore/ps.c @@ -38,7 +38,7 @@ void wl1271_elp_work(struct work_struct *work) struct wl12xx_vif *wlvif; int ret; - dwork = container_of(work, struct delayed_work, work); + dwork = to_delayed_work(work); wl = container_of(dwork, struct wl1271, elp_work); wl1271_debug(DEBUG_PSM, "elp work"); |