aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/wireless/ti/wl18xx
diff options
context:
space:
mode:
authorArik Nemtsov <arik@wizery.com>2012-11-28 11:42:46 +0200
committerLuciano Coelho <coelho@ti.com>2012-12-11 12:37:23 +0200
commitc80daad625b382fcd72ad68a5c0a26933263aa85 (patch)
tree18b2987268f238f497ecd24c137c66e3d00b8f3f /drivers/net/wireless/ti/wl18xx
parent9ae5d8d4b7b845869a04576a7bc5fa6cf9716cd5 (diff)
downloadvexpress-lsk-c80daad625b382fcd72ad68a5c0a26933263aa85.tar.gz
wl18xx: support MIMO only if HT mode is not forced to SISO
Don't use MIMO rates when HT mode is forced to SISO, even if we have multiple antennas. Signed-off-by: Arik Nemtsov <arik@wizery.com> Signed-off-by: Luciano Coelho <coelho@ti.com>
Diffstat (limited to 'drivers/net/wireless/ti/wl18xx')
-rw-r--r--drivers/net/wireless/ti/wl18xx/main.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/net/wireless/ti/wl18xx/main.c b/drivers/net/wireless/ti/wl18xx/main.c
index 3f6762c9b9a..0ff9bc7b1f3 100644
--- a/drivers/net/wireless/ti/wl18xx/main.c
+++ b/drivers/net/wireless/ti/wl18xx/main.c
@@ -1078,7 +1078,12 @@ static bool wl18xx_is_mimo_supported(struct wl1271 *wl)
{
struct wl18xx_priv *priv = wl->priv;
- return priv->conf.phy.number_of_assembled_ant2_4 >= 2;
+ /* only support MIMO with multiple antennas, and when SISO
+ * is not forced through config
+ */
+ return (priv->conf.phy.number_of_assembled_ant2_4 >= 2) &&
+ (priv->conf.ht.mode != HT_MODE_WIDE) &&
+ (priv->conf.ht.mode != HT_MODE_SISO20);
}
/*