From d9892f0803d65c6feecd1f3258bc337cd2d96720 Mon Sep 17 00:00:00 2001
From: Amitkumar Karwar <akarwar@marvell.com>
Date: Wed, 1 Feb 2012 20:41:45 -0800
Subject: [PATCH] --- yaml --- r: 290367 b: refs/heads/master c:
 3dc5e1751803e812806d7aa46150af92f91ef489 h: refs/heads/master i:   290365:
 84b2917ba64a64bcefd7baf3311663c415cc0f8d   290363:
 62a2dd0a0d9b0ac5806b37503c7a4f2fdfe04a95   290359:
 892a0d97ac9ffa406c6dd2517f30d589ccdc301d   290351:
 f90fe294ca9fc55ee9385ccd29b5775735767bf8   290335:
 4e9bd39019afb06bd0f0807f5c5dab105fe31a5f   290303:
 64926f33b210766889075baf278f6e2e0d308dc7 v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/net/wireless/mwifiex/init.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e597b716c987..6bc1d77856c3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 477778bb0e7c671860528946b412294684337c5e
+refs/heads/master: 3dc5e1751803e812806d7aa46150af92f91ef489
diff --git a/trunk/drivers/net/wireless/mwifiex/init.c b/trunk/drivers/net/wireless/mwifiex/init.c
index e13b6d99171a..83cc10fca4bd 100644
--- a/trunk/drivers/net/wireless/mwifiex/init.c
+++ b/trunk/drivers/net/wireless/mwifiex/init.c
@@ -280,6 +280,7 @@ static void mwifiex_init_adapter(struct mwifiex_adapter *adapter)
 	adapter->adhoc_awake_period = 0;
 	memset(&adapter->arp_filter, 0, sizeof(adapter->arp_filter));
 	adapter->arp_filter_size = 0;
+	adapter->channel_type = NL80211_CHAN_HT20;
 }
 
 /*