Merge remote-tracking branch 'regulator/for-next'

[deliverable/linux.git] / drivers / net / wireless / marvell / mwifiex / 11h.c

diff --git a/drivers/net/wireless/marvell/mwifiex/11h.c b/drivers/net/wireless/marvell/mwifiex/11h.c
index 81c60d0a1bda348728fb539e4d487285d3367aa3..43dccd5b0291f98fcf184822d8a50374c142fc9c 100644 (file)
--- a/drivers/net/wireless/marvell/mwifiex/11h.c
+++ b/drivers/net/wireless/marvell/mwifiex/11h.c
@@ -260,22 +260,17 @@ int mwifiex_11h_handle_radar_detected(struct mwifiex_private *priv,
 
        rdr_event = (void *)(skb->data + sizeof(u32));
 
-       if (le32_to_cpu(rdr_event->passed)) {
-               mwifiex_dbg(priv->adapter, MSG,
-                           "radar detected; indicating kernel\n");
-               if (mwifiex_stop_radar_detection(priv, &priv->dfs_chandef))
-                       mwifiex_dbg(priv->adapter, ERROR,
-                                   "Failed to stop CAC in FW\n");
-               cfg80211_radar_event(priv->adapter->wiphy, &priv->dfs_chandef,
-                                    GFP_KERNEL);
-               mwifiex_dbg(priv->adapter, MSG, "regdomain: %d\n",
-                           rdr_event->reg_domain);
-               mwifiex_dbg(priv->adapter, MSG, "radar detection type: %d\n",
-                           rdr_event->det_type);
-       } else {
-               mwifiex_dbg(priv->adapter, MSG,
-                           "false radar detection event!\n");
-       }
+       mwifiex_dbg(priv->adapter, MSG,
+                   "radar detected; indicating kernel\n");
+       if (mwifiex_stop_radar_detection(priv, &priv->dfs_chandef))
+               mwifiex_dbg(priv->adapter, ERROR,
+                           "Failed to stop CAC in FW\n");
+       cfg80211_radar_event(priv->adapter->wiphy, &priv->dfs_chandef,
+                            GFP_KERNEL);
+       mwifiex_dbg(priv->adapter, MSG, "regdomain: %d\n",
+                   rdr_event->reg_domain);
+       mwifiex_dbg(priv->adapter, MSG, "radar detection type: %d\n",
+                   rdr_event->det_type);
 
        return 0;
 }