From 4ace1138767869547944798ba9f1fd6d1e048acb Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Fri, 25 May 2007 13:16:38 -0400 Subject: [PATCH] libertas: replace 'macaddress' with 'bssid' Start to normalize bss_descriptor with ieee80211_network so we can eventually replace bss_descriptor more easily. Signed-off-by: Dan Williams Signed-off-by: John W. Linville --- drivers/net/wireless/libertas/join.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'drivers/net/wireless/libertas/join.c') diff --git a/drivers/net/wireless/libertas/join.c b/drivers/net/wireless/libertas/join.c index 8c578ec452e4..c9111b877067 100644 --- a/drivers/net/wireless/libertas/join.c +++ b/drivers/net/wireless/libertas/join.c @@ -113,7 +113,7 @@ int wlan_associate(wlan_private * priv, struct bss_descriptor * pbssdesc) ret = libertas_prepare_and_send_command(priv, cmd_802_11_authenticate, 0, cmd_option_waitforrsp, - 0, pbssdesc->macaddress); + 0, pbssdesc->bssid); if (ret) goto done; @@ -353,7 +353,7 @@ int libertas_cmd_80211_associate(wlan_private * priv, adapter->pattemptedbssdesc = pbssdesc; memcpy(passo->peerstaaddr, - pbssdesc->macaddress, sizeof(passo->peerstaaddr)); + pbssdesc->bssid, sizeof(passo->peerstaaddr)); pos += sizeof(passo->peerstaaddr); /* set the listen interval */ @@ -632,7 +632,7 @@ int libertas_cmd_80211_ad_hoc_join(wlan_private * priv, padhocjoin->bssdescriptor.beaconperiod = pbssdesc->beaconperiod; memcpy(&padhocjoin->bssdescriptor.BSSID, - &pbssdesc->macaddress, ETH_ALEN); + &pbssdesc->bssid, ETH_ALEN); memcpy(&padhocjoin->bssdescriptor.SSID, &pbssdesc->ssid.ssid, pbssdesc->ssid.ssidlength); @@ -787,7 +787,7 @@ int libertas_ret_80211_associate(wlan_private * priv, /* Set the new BSSID (AP's MAC address) to current BSSID */ memcpy(adapter->curbssparams.bssid, - pbssdesc->macaddress, ETH_ALEN); + pbssdesc->bssid, ETH_ALEN); /* Make a copy of current BSSID descriptor */ memcpy(&adapter->curbssparams.bssdescriptor, @@ -880,8 +880,7 @@ int libertas_ret_80211_ad_hoc_start(wlan_private * priv, if (command == cmd_ret_802_11_ad_hoc_start) { /* Update the created network descriptor with the new BSSID */ - memcpy(pbssdesc->macaddress, - padhocresult->BSSID, ETH_ALEN); + memcpy(pbssdesc->bssid, padhocresult->BSSID, ETH_ALEN); } else { /* Make a copy of current BSSID descriptor, only needed for join since @@ -892,8 +891,7 @@ int libertas_ret_80211_ad_hoc_start(wlan_private * priv, } /* Set the BSSID from the joined/started descriptor */ - memcpy(&adapter->curbssparams.bssid, - pbssdesc->macaddress, ETH_ALEN); + memcpy(&adapter->curbssparams.bssid, pbssdesc->bssid, ETH_ALEN); /* Set the new SSID to current SSID */ memcpy(&adapter->curbssparams.ssid, -- cgit v1.2.3