From dfbb10140dcea3b4c5859b882ccea3e95f9df246 Mon Sep 17 00:00:00 2001 From: Ron Rindjunsky Date: Thu, 29 May 2008 16:35:19 +0800 Subject: [PATCH] --- yaml --- r: 102832 b: refs/heads/master c: 3c57601d0a1993cfc12a27cc6652b750bb44c523 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-core.h | 6 ++++++ trunk/drivers/net/wireless/iwlwifi/iwl4965-base.c | 6 ------ 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 2d3a25430153..8a420aa64d32 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 37a44211cbe27795dbb79b2ea7036ff784f18d73 +refs/heads/master: 3c57601d0a1993cfc12a27cc6652b750bb44c523 diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-core.h b/trunk/drivers/net/wireless/iwlwifi/iwl-core.h index 004c68444006..6b5af7afbb25 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-core.h +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-core.h @@ -342,4 +342,10 @@ static inline int iwl_send_rxon_assoc(struct iwl_priv *priv) return priv->cfg->ops->hcmd->rxon_assoc(priv); } +static inline const struct ieee80211_supported_band *iwl_get_hw_mode( + struct iwl_priv *priv, enum ieee80211_band band) +{ + return priv->hw->wiphy->bands[band]; +} + #endif /* __iwl_core_h__ */ diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl4965-base.c b/trunk/drivers/net/wireless/iwlwifi/iwl4965-base.c index 49e72d461474..676d04356b55 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl4965-base.c +++ b/trunk/drivers/net/wireless/iwlwifi/iwl4965-base.c @@ -87,12 +87,6 @@ MODULE_VERSION(DRV_VERSION); MODULE_AUTHOR(DRV_COPYRIGHT); MODULE_LICENSE("GPL"); -static const struct ieee80211_supported_band *iwl_get_hw_mode( - struct iwl_priv *priv, enum ieee80211_band band) -{ - return priv->hw->wiphy->bands[band]; -} - static int iwl4965_is_empty_essid(const char *essid, int essid_len) { /* Single white space is for Linksys APs */