[PATCH] libertas: remove adapter->listeninterval

[mirror_ubuntu-bionic-kernel.git] / drivers / net / wireless / libertas / join.c

diff --git a/drivers/net/wireless/libertas/join.c b/drivers/net/wireless/libertas/join.c
index 2b538ab51d409f8518dcb6a038f8b5aa098ccdea..e335a7e4adaa79fb43923319f962261f6e30b65e 100644 (file)
--- a/drivers/net/wireless/libertas/join.c
+++ b/drivers/net/wireless/libertas/join.c
@@ -369,7 +369,7 @@ int libertas_cmd_80211_associate(wlan_private * priv,
        pos += sizeof(passo->peerstaaddr);
 
        /* set the listen interval */
-       passo->listeninterval = cpu_to_le16(adapter->listeninterval);
+       passo->listeninterval = cpu_to_le16(MRVDRV_DEFAULT_LISTEN_INTERVAL);
 
        pos += sizeof(passo->capability);
        pos += sizeof(passo->listeninterval);
@@ -518,7 +518,7 @@ int libertas_cmd_80211_ad_hoc_start(wlan_private * priv,
 
        adhs->ssparamset.ibssparamset.elementid = IBSS_PARA_IE_ID;
        adhs->ssparamset.ibssparamset.len = IBSS_PARA_IE_LEN;
-       adhs->ssparamset.ibssparamset.atimwindow = cpu_to_le16(adapter->atimwindow);
+       adhs->ssparamset.ibssparamset.atimwindow = 0;
 
        /* set capability info */
        tmpcap = WLAN_CAPABILITY_IBSS;
@@ -814,7 +814,7 @@ int libertas_ret_80211_ad_hoc_start(wlan_private * priv,
        /* Send a Media Connected event, according to the Spec */
        adapter->connect_status = LIBERTAS_CONNECTED;
 
-       if (command == CMD_RET_802_11_AD_HOC_START) {
+       if (command == CMD_RET(CMD_802_11_AD_HOC_START)) {
                /* Update the created network descriptor with the new BSSID */
                memcpy(bss->bssid, padhocresult->bssid, ETH_ALEN);
        }