Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6

[firefly-linux-kernel-4.4.55.git] / net / mac80211 / driver-ops.c

diff --git a/net/mac80211/driver-ops.c b/net/mac80211/driver-ops.c
index a1d54318f16c044c0554fa8df5dc996f591bbb0a..ca1fe5576103767c3a98b52e037c0034b949887f 100644 (file)
--- a/net/mac80211/driver-ops.c
+++ b/net/mac80211/driver-ops.c
@@ -1,4 +1,6 @@
 /*
+ * Copyright 2015 Intel Deutschland GmbH
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
@@ -8,6 +10,48 @@
 #include "trace.h"
 #include "driver-ops.h"
 
+int drv_start(struct ieee80211_local *local)
+{
+       int ret;
+
+       might_sleep();
+
+       if (WARN_ON(local->started))
+               return -EALREADY;
+
+       trace_drv_start(local);
+       local->started = true;
+       /* allow rx frames */
+       smp_mb();
+       ret = local->ops->start(&local->hw);
+       trace_drv_return_int(local, ret);
+
+       if (ret)
+               local->started = false;
+
+       return ret;
+}
+
+void drv_stop(struct ieee80211_local *local)
+{
+       might_sleep();
+
+       if (WARN_ON(!local->started))
+               return;
+
+       trace_drv_stop(local);
+       local->ops->stop(&local->hw);
+       trace_drv_return_void(local);
+
+       /* sync away all work on the tasklet before clearing started */
+       tasklet_disable(&local->tasklet);
+       tasklet_enable(&local->tasklet);
+
+       barrier();
+
+       local->started = false;
+}
+
 int drv_add_interface(struct ieee80211_local *local,
                      struct ieee80211_sub_if_data *sdata)
 {
@@ -192,6 +236,8 @@ int drv_switch_vif_chanctx(struct ieee80211_local *local,
        int ret = 0;
        int i;
 
+       might_sleep();
+
        if (!local->ops->switch_vif_chanctx)
                return -EOPNOTSUPP;