lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

iwlwifi: rename ibss_beacon variable

Browse Source 
Since we're also going to support AP (GO) mode,
the variable isn't used for just IBSS beacons
any more -- rename it to not mislead readers.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
This commit is contained in:
Johannes Berg
2010-10-04 05:50:06 -07:00
committed by Wey-Yi Guy
parent 085fbca29d
commit 12e934dc60
4 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/net/wireless/iwlwifi/iwl-agn.c
View File

@@ -317,15 +317,15 @@ static u32 iwl_fill_beacon_frame(struct iwl_priv *priv,
struct ieee80211_hdr *hdr, struct ieee80211_hdr *hdr,
int left) int left)
{ {
if (!priv->ibss_beacon) if (!priv->beacon_skb)
return 0; return 0;
if (priv->ibss_beacon->len > left) if (priv->beacon_skb->len > left)
return 0; return 0;
memcpy(hdr, priv->ibss_beacon->data, priv->ibss_beacon->len); memcpy(hdr, priv->beacon_skb->data, priv->beacon_skb->len);
return priv->ibss_beacon->len; return priv->beacon_skb->len;
} }
/* Parse the beacon frame to find the TIM element and set tim_idx & tim_size */ /* Parse the beacon frame to find the TIM element and set tim_idx & tim_size */
@@ -653,10 +653,10 @@ static void iwl_bg_beacon_update(struct work_struct *work)
} }
/* new beacon skb is allocated every time; dispose previous.*/ /* new beacon skb is allocated every time; dispose previous.*/
if (priv->ibss_beacon) if (priv->beacon_skb)
dev_kfree_skb(priv->ibss_beacon); dev_kfree_skb(priv->beacon_skb);
priv->ibss_beacon = beacon; priv->beacon_skb = beacon;
iwl_send_beacon_cmd(priv); iwl_send_beacon_cmd(priv);
out: out:
@@ -2993,9 +2993,9 @@ static void __iwl_down(struct iwl_priv *priv)
exit: exit:
memset(&priv->card_alive, 0, sizeof(struct iwl_alive_resp)); memset(&priv->card_alive, 0, sizeof(struct iwl_alive_resp));
if (priv->ibss_beacon) if (priv->beacon_skb)
dev_kfree_skb(priv->ibss_beacon); dev_kfree_skb(priv->beacon_skb);
priv->ibss_beacon = NULL; priv->beacon_skb = NULL;
/* clear out any free frames */ /* clear out any free frames */
iwl_clear_free_frames(priv); iwl_clear_free_frames(priv);
@@ -4131,7 +4131,7 @@ static int iwl_init_drv(struct iwl_priv *priv)
{ {
int ret; int ret;
priv->ibss_beacon = NULL; priv->beacon_skb = NULL;
spin_lock_init(&priv->sta_lock); spin_lock_init(&priv->sta_lock);
spin_lock_init(&priv->hcmd_lock); spin_lock_init(&priv->hcmd_lock);
@@ -4645,8 +4645,8 @@ static void __devexit iwl_pci_remove(struct pci_dev *pdev)
iwl_free_isr_ict(priv); iwl_free_isr_ict(priv);
if (priv->ibss_beacon) if (priv->beacon_skb)
dev_kfree_skb(priv->ibss_beacon); dev_kfree_skb(priv->beacon_skb);
ieee80211_free_hw(priv->hw); ieee80211_free_hw(priv->hw);
} }

16
drivers/net/wireless/iwlwifi/iwl-core.c
View File

@@ -1552,10 +1552,10 @@ static void iwlcore_beacon_update(struct ieee80211_hw *hw,
spin_lock_irqsave(&priv->lock, flags); spin_lock_irqsave(&priv->lock, flags);
if (priv->ibss_beacon) if (priv->beacon_skb)
dev_kfree_skb(priv->ibss_beacon); dev_kfree_skb(priv->beacon_skb);
priv->ibss_beacon = skb; priv->beacon_skb = skb;
timestamp = ((struct ieee80211_mgmt *)skb->data)->u.beacon.timestamp; timestamp = ((struct ieee80211_mgmt *)skb->data)->u.beacon.timestamp;
priv->timestamp = le64_to_cpu(timestamp); priv->timestamp = le64_to_cpu(timestamp);
@@ -1610,8 +1610,8 @@ void iwl_bss_info_changed(struct ieee80211_hw *hw,
} }
if (changes & BSS_CHANGED_BEACON && vif->type == NL80211_IFTYPE_AP) { if (changes & BSS_CHANGED_BEACON && vif->type == NL80211_IFTYPE_AP) {
dev_kfree_skb(priv->ibss_beacon); dev_kfree_skb(priv->beacon_skb);
priv->ibss_beacon = ieee80211_beacon_get(hw, vif); priv->beacon_skb = ieee80211_beacon_get(hw, vif);
} }
if (changes & BSS_CHANGED_BEACON_INT && vif->type == NL80211_IFTYPE_AP) if (changes & BSS_CHANGED_BEACON_INT && vif->type == NL80211_IFTYPE_AP)
@@ -2060,10 +2060,10 @@ void iwl_mac_reset_tsf(struct ieee80211_hw *hw)
spin_lock_irqsave(&priv->lock, flags); spin_lock_irqsave(&priv->lock, flags);
/* new association get rid of ibss beacon skb */ /* new association get rid of ibss beacon skb */
if (priv->ibss_beacon) if (priv->beacon_skb)
dev_kfree_skb(priv->ibss_beacon); dev_kfree_skb(priv->beacon_skb);
priv->ibss_beacon = NULL; priv->beacon_skb = NULL;
priv->timestamp = 0; priv->timestamp = 0;

4
drivers/net/wireless/iwlwifi/iwl-dev.h
View File

@@ -1383,8 +1383,6 @@ struct iwl_priv {
enum nl80211_iftype iw_mode; enum nl80211_iftype iw_mode;
struct sk_buff *ibss_beacon;
/* Last Rx'd beacon timestamp */ /* Last Rx'd beacon timestamp */
u64 timestamp; u64 timestamp;
@@ -1496,8 +1494,10 @@ struct iwl_priv {
struct work_struct scan_completed; struct work_struct scan_completed;
struct work_struct rx_replenish; struct work_struct rx_replenish;
struct work_struct abort_scan; struct work_struct abort_scan;
struct work_struct beacon_update; struct work_struct beacon_update;
struct iwl_rxon_context *beacon_ctx; struct iwl_rxon_context *beacon_ctx;
struct sk_buff *beacon_skb;
struct work_struct tt_work; struct work_struct tt_work;
struct work_struct ct_enter; struct work_struct ct_enter;

26
drivers/net/wireless/iwlwifi/iwl3945-base.c
View File

@@ -317,15 +317,15 @@ unsigned int iwl3945_fill_beacon_frame(struct iwl_priv *priv,
int left) int left)
{ {
if (!iwl_is_associated(priv, IWL_RXON_CTX_BSS) || !priv->ibss_beacon) if (!iwl_is_associated(priv, IWL_RXON_CTX_BSS) || !priv->beacon_skb)
return 0; return 0;
if (priv->ibss_beacon->len > left) if (priv->beacon_skb->len > left)
return 0; return 0;
memcpy(hdr, priv->ibss_beacon->data, priv->ibss_beacon->len); memcpy(hdr, priv->beacon_skb->data, priv->beacon_skb->len);
return priv->ibss_beacon->len; return priv->beacon_skb->len;
} }
static int iwl3945_send_beacon_cmd(struct iwl_priv *priv) static int iwl3945_send_beacon_cmd(struct iwl_priv *priv)
@@ -813,10 +813,10 @@ static void iwl3945_bg_beacon_update(struct work_struct *work)
mutex_lock(&priv->mutex); mutex_lock(&priv->mutex);
/* new beacon skb is allocated every time; dispose previous.*/ /* new beacon skb is allocated every time; dispose previous.*/
if (priv->ibss_beacon) if (priv->beacon_skb)
dev_kfree_skb(priv->ibss_beacon); dev_kfree_skb(priv->beacon_skb);
priv->ibss_beacon = beacon; priv->beacon_skb = beacon;
mutex_unlock(&priv->mutex); mutex_unlock(&priv->mutex);
iwl3945_send_beacon_cmd(priv); iwl3945_send_beacon_cmd(priv);
@@ -2642,9 +2642,9 @@ static void __iwl3945_down(struct iwl_priv *priv)
exit: exit:
memset(&priv->card_alive, 0, sizeof(struct iwl_alive_resp)); memset(&priv->card_alive, 0, sizeof(struct iwl_alive_resp));
if (priv->ibss_beacon) if (priv->beacon_skb)
dev_kfree_skb(priv->ibss_beacon); dev_kfree_skb(priv->beacon_skb);
priv->ibss_beacon = NULL; priv->beacon_skb = NULL;
/* clear out any free frames */ /* clear out any free frames */
iwl3945_clear_free_frames(priv); iwl3945_clear_free_frames(priv);
@@ -3848,7 +3848,7 @@ static int iwl3945_init_drv(struct iwl_priv *priv)
struct iwl3945_eeprom *eeprom = (struct iwl3945_eeprom *)priv->eeprom; struct iwl3945_eeprom *eeprom = (struct iwl3945_eeprom *)priv->eeprom;
priv->retry_rate = 1; priv->retry_rate = 1;
priv->ibss_beacon = NULL; priv->beacon_skb = NULL;
spin_lock_init(&priv->sta_lock); spin_lock_init(&priv->sta_lock);
spin_lock_init(&priv->hcmd_lock); spin_lock_init(&priv->hcmd_lock);
@@ -4256,8 +4256,8 @@ static void __devexit iwl3945_pci_remove(struct pci_dev *pdev)
iwl_free_channel_map(priv); iwl_free_channel_map(priv);
iwlcore_free_geos(priv); iwlcore_free_geos(priv);
kfree(priv->scan_cmd); kfree(priv->scan_cmd);
if (priv->ibss_beacon) if (priv->beacon_skb)
dev_kfree_skb(priv->ibss_beacon); dev_kfree_skb(priv->beacon_skb);
ieee80211_free_hw(priv->hw); ieee80211_free_hw(priv->hw);
} }