summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Tarnyagin <dmitry.tarnyagin@sonyericsson.com>2012-02-29 15:14:30 +0100
committerPhilippe Langlais <philippe.langlais@stericsson.com>2012-05-22 11:06:39 +0200
commit66854f8dfa58d91afeb9b0baac364682b0d72415 (patch)
tree1c0566cdf8b517409f85787fcb789aa2d35bf5f3
parent74ce5fb12b483f13663096a5d317c73cb99ea6da (diff)
cw1200: Add option to disable 11d beacon hints.
Some setups use country information from an external provider. For these setups 11d hinting in the driver should be disabled to avoid interference with misconfigured APs in the air. ST-Ericsson ID: 372882 Change-Id: I734880c8f14aa2a57453623d09099f813d3d207f Signed-off-by: Dmitry Tarnyagin <dmitry.tarnyagin@sonyericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/36609 Reviewed-by: Bartosz MARKOWSKI <bartosz.markowski@tieto.com> Tested-by: Bartosz MARKOWSKI <bartosz.markowski@tieto.com>
-rw-r--r--drivers/staging/cw1200/Kconfig7
-rw-r--r--drivers/staging/cw1200/main.c4
2 files changed, 11 insertions, 0 deletions
diff --git a/drivers/staging/cw1200/Kconfig b/drivers/staging/cw1200/Kconfig
index 8a536acc7d9..dbb97adb829 100644
--- a/drivers/staging/cw1200/Kconfig
+++ b/drivers/staging/cw1200/Kconfig
@@ -49,6 +49,13 @@ config CW1200_U5500_SUPPORT
Say Y if you want to enable wlan on u5500 platform support.
If unsure, say N.
+config CW1200_DISABLE_BEACON_HINTS
+ bool "Disable 11d beacon hints"
+ depends on CW1200
+ help
+ Say Y if you want to disable 11d beacon hints.
+ If unsure, say N.
+
menu "Driver debug features"
depends on CW1200
diff --git a/drivers/staging/cw1200/main.c b/drivers/staging/cw1200/main.c
index c8eb01b94e1..89d59e153b0 100644
--- a/drivers/staging/cw1200/main.c
+++ b/drivers/staging/cw1200/main.c
@@ -282,6 +282,10 @@ struct ieee80211_hw *cw1200_init_common(size_t priv_data_len)
hw->wiphy->flags |= WIPHY_FLAG_AP_UAPSD;
#endif /* CONFIG_CW1200_USE_STE_EXTENSIONS */
+#if defined(CONFIG_CW1200_DISABLE_BEACON_HINTS)
+ hw->wiphy->flags |= WIPHY_FLAG_DISABLE_BEACON_HINTS;
+#endif
+
hw->channel_change_time = 1000; /* TODO: find actual value */
/* priv->beacon_req_id = cpu_to_le32(0); */
hw->queues = 4;