iwlwifi: update copyright year to 2009

[pandora-kernel.git] / drivers / net / wireless / iwlwifi / iwl-agn-hcmd-check.c

diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-hcmd-check.c b/drivers/net/wireless/iwlwifi/iwl-agn-hcmd-check.c
index b8137ee..1217a1d 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-agn-hcmd-check.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-hcmd-check.c
@@ -2,7 +2,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2008 Intel Corporation. All rights reserved.
+ * Copyright(c) 2008 - 2009 Intel Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -40,67 +40,68 @@
  * be #ifdef'd out once the driver is stable and folks aren't actively
  * making changes
  */
-int iwl_agn_check_rxon_cmd(struct iwl_rxon_cmd *rxon)
+int iwl_agn_check_rxon_cmd(struct iwl_priv *priv)
 {
        int error = 0;
        int counter = 1;
+       struct iwl_rxon_cmd *rxon = &priv->staging_rxon;
 
        if (rxon->flags & RXON_FLG_BAND_24G_MSK) {
                error |= le32_to_cpu(rxon->flags &
                                (RXON_FLG_TGJ_NARROW_BAND_MSK |
                                 RXON_FLG_RADAR_DETECT_MSK));
                if (error)
-                       IWL_WARNING("check 24G fields %d | %d\n",
+                       IWL_WARN(priv, "check 24G fields %d | %d\n",
                                    counter++, error);
        } else {
                error |= (rxon->flags & RXON_FLG_SHORT_SLOT_MSK) ?
                                0 : le32_to_cpu(RXON_FLG_SHORT_SLOT_MSK);
                if (error)
-                       IWL_WARNING("check 52 fields %d | %d\n",
+                       IWL_WARN(priv, "check 52 fields %d | %d\n",
                                    counter++, error);
                error |= le32_to_cpu(rxon->flags & RXON_FLG_CCK_MSK);
                if (error)
-                       IWL_WARNING("check 52 CCK %d | %d\n",
+                       IWL_WARN(priv, "check 52 CCK %d | %d\n",
                                    counter++, error);
        }
        error |= (rxon->node_addr[0] | rxon->bssid_addr[0]) & 0x1;
        if (error)
-               IWL_WARNING("check mac addr %d | %d\n", counter++, error);
+               IWL_WARN(priv, "check mac addr %d | %d\n", counter++, error);
 
        /* make sure basic rates 6Mbps and 1Mbps are supported */
        error |= (((rxon->ofdm_basic_rates & IWL_RATE_6M_MASK) == 0) &&
                  ((rxon->cck_basic_rates & IWL_RATE_1M_MASK) == 0));
        if (error)
-               IWL_WARNING("check basic rate %d | %d\n", counter++, error);
+               IWL_WARN(priv, "check basic rate %d | %d\n", counter++, error);
 
        error |= (le16_to_cpu(rxon->assoc_id) > 2007);
        if (error)
-               IWL_WARNING("check assoc id %d | %d\n", counter++, error);
+               IWL_WARN(priv, "check assoc id %d | %d\n", counter++, error);
 
        error |= ((rxon->flags & (RXON_FLG_CCK_MSK | RXON_FLG_SHORT_SLOT_MSK))
                        == (RXON_FLG_CCK_MSK | RXON_FLG_SHORT_SLOT_MSK));
        if (error)
-               IWL_WARNING("check CCK and short slot %d | %d\n",
+               IWL_WARN(priv, "check CCK and short slot %d | %d\n",
                            counter++, error);
 
        error |= ((rxon->flags & (RXON_FLG_CCK_MSK | RXON_FLG_AUTO_DETECT_MSK))
                        == (RXON_FLG_CCK_MSK | RXON_FLG_AUTO_DETECT_MSK));
        if (error)
-               IWL_WARNING("check CCK & auto detect %d | %d\n",
+               IWL_WARN(priv, "check CCK & auto detect %d | %d\n",
                            counter++, error);
 
        error |= ((rxon->flags & (RXON_FLG_AUTO_DETECT_MSK |
                        RXON_FLG_TGG_PROTECT_MSK)) == RXON_FLG_TGG_PROTECT_MSK);
        if (error)
-               IWL_WARNING("check TGG and auto detect %d | %d\n",
+               IWL_WARN(priv, "check TGG and auto detect %d | %d\n",
                            counter++, error);
 
        if (error)
-               IWL_WARNING("Tuning to channel %d\n",
+               IWL_WARN(priv, "Tuning to channel %d\n",
                            le16_to_cpu(rxon->channel));
 
        if (error) {
-               IWL_ERROR("Not a valid iwl4965_rxon_assoc_cmd field values\n");
+               IWL_ERR(priv, "Not a valid iwl_rxon_assoc_cmd field values\n");
                return -1;
        }
        return 0;