Merge tag 'for-linus-20141215' of git://git.infradead.org/linux-mtd

[cascardo/linux.git] / drivers / net / wireless / mwifiex / join.c

diff --git a/drivers/net/wireless/mwifiex/join.c b/drivers/net/wireless/mwifiex/join.c
index 8d6c259..411a6c2 100644 (file)
--- a/drivers/net/wireless/mwifiex/join.c
+++ b/drivers/net/wireless/mwifiex/join.c
@@ -880,9 +880,7 @@ mwifiex_cmd_802_11_ad_hoc_start(struct mwifiex_private *priv,
 
        /* Set Capability info */
        bss_desc->cap_info_bitmap |= WLAN_CAPABILITY_IBSS;
-       tmp_cap = le16_to_cpu(adhoc_start->cap_info_bitmap);
-       tmp_cap &= ~WLAN_CAPABILITY_ESS;
-       tmp_cap |= WLAN_CAPABILITY_IBSS;
+       tmp_cap = WLAN_CAPABILITY_IBSS;
 
        /* Set up privacy in bss_desc */
        if (priv->sec_info.encryption_mode) {