Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

[linux-2.6-microblaze.git] / net / mac80211 / offchannel.c

diff --git a/net/mac80211/offchannel.c b/net/mac80211/offchannel.c
index 60ef897..c710504 100644 (file)
--- a/net/mac80211/offchannel.c
+++ b/net/mac80211/offchannel.c
@@ -8,6 +8,7 @@
  * Copyright 2006-2007 Jiri Benc <jbenc@suse.cz>
  * Copyright 2007, Michael Wu <flamingice@sourmilk.net>
  * Copyright 2009      Johannes Berg <johannes@sipsolutions.net>
+ * Copyright (C) 2019 Intel Corporation
  */
 #include <linux/export.h>
 #include <net/mac80211.h>
@@ -732,7 +733,7 @@ static int ieee80211_cancel_roc(struct ieee80211_local *local,
        }
 
        if (local->ops->remain_on_channel) {
-               ret = drv_cancel_remain_on_channel(local);
+               ret = drv_cancel_remain_on_channel(local, roc->sdata);
                if (WARN_ON_ONCE(ret)) {
                        mutex_unlock(&local->mtx);
                        return ret;
@@ -991,7 +992,7 @@ void ieee80211_roc_purge(struct ieee80211_local *local,
                if (roc->started) {
                        if (local->ops->remain_on_channel) {
                                /* can race, so ignore return value */
-                               drv_cancel_remain_on_channel(local);
+                               drv_cancel_remain_on_channel(local, sdata);
                                ieee80211_roc_notify_destroy(roc);
                        } else {
                                roc->abort = true;