aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMeenakshi Venkataraman <meenakshi.venkataraman@intel.com>2012-03-14 18:59:15 -0400
committerWey-Yi Guy <wey-yi.w.guy@intel.com>2012-04-12 17:23:48 -0400
commitf32cadfc0d084a3cf1523aa59abe532217a970dc (patch)
tree14356f468f7476690dd8bc56daa728b0409a8d02
parent66cd9e39c6c0a870f12828b5f5b9e1d2e7c70313 (diff)
iwlwifi: move iwl_bcast_addr to iwl-agn-sta.c
Move this as part of iwl-core.c cleanup. Signed-off-by: Meenakshi Venkataraman <meenakshi.venkataraman@intel.com> Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn-sta.c2
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-core.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-sta.c b/drivers/net/wireless/iwlwifi/iwl-agn-sta.c
index 42af9f94d7d9..0119e7a7b78d 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-sta.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-sta.c
@@ -34,6 +34,8 @@
34#include "iwl-agn.h" 34#include "iwl-agn.h"
35#include "iwl-trans.h" 35#include "iwl-trans.h"
36 36
37const u8 iwl_bcast_addr[ETH_ALEN] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
38
37static int iwl_sta_ucode_activate(struct iwl_priv *priv, u8 sta_id) 39static int iwl_sta_ucode_activate(struct iwl_priv *priv, u8 sta_id)
38{ 40{
39 lockdep_assert_held(&priv->sta_lock); 41 lockdep_assert_held(&priv->sta_lock);
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c
index 26eb7fafff76..94a4ebcb447b 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.c
+++ b/drivers/net/wireless/iwlwifi/iwl-core.c
@@ -41,8 +41,6 @@
41#include "iwl-agn.h" 41#include "iwl-agn.h"
42#include "iwl-trans.h" 42#include "iwl-trans.h"
43 43
44const u8 iwl_bcast_addr[ETH_ALEN] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
45
46 44
47 45
48#ifdef CONFIG_IWLWIFI_DEBUGFS 46#ifdef CONFIG_IWLWIFI_DEBUGFS