iwlwifi: rename ibss_beacon variable

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>

1 files changed, 13 insertions, 13 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index 3ee3e55fa546..8f8c4b73f8b9 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -317,15 +317,15 @@ unsigned int iwl3945_fill_beacon_frame(struct iwl_priv *priv,
                                 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;
 
-        if (priv->ibss_beacon->len > left)
+        if (priv->beacon_skb->len > left)
                 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)
@@ -813,10 +813,10 @@ static void iwl3945_bg_beacon_update(struct work_struct *work)
 
         mutex_lock(&priv->mutex);
         /* new beacon skb is allocated every time; dispose previous.*/
-        if (priv->ibss_beacon)
-                dev_kfree_skb(priv->ibss_beacon);
+        if (priv->beacon_skb)
+                dev_kfree_skb(priv->beacon_skb);
 
-        priv->ibss_beacon = beacon;
+        priv->beacon_skb = beacon;
         mutex_unlock(&priv->mutex);
 
         iwl3945_send_beacon_cmd(priv);
@@ -2642,9 +2642,9 @@ static void __iwl3945_down(struct iwl_priv *priv)
  exit:
         memset(&priv->card_alive, 0, sizeof(struct iwl_alive_resp));
 
-        if (priv->ibss_beacon)
-                dev_kfree_skb(priv->ibss_beacon);
-        priv->ibss_beacon = NULL;
+        if (priv->beacon_skb)
+                dev_kfree_skb(priv->beacon_skb);
+        priv->beacon_skb = NULL;
 
         /* clear out any free frames */
         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;
 
         priv->retry_rate = 1;
-        priv->ibss_beacon = NULL;
+        priv->beacon_skb = NULL;
 
         spin_lock_init(&priv->sta_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);
         iwlcore_free_geos(priv);
         kfree(priv->scan_cmd);
-        if (priv->ibss_beacon)
-                dev_kfree_skb(priv->ibss_beacon);
+        if (priv->beacon_skb)
+                dev_kfree_skb(priv->beacon_skb);
 
         ieee80211_free_hw(priv->hw);
 }