---

yaml --- r: 278187 b: refs/heads/master c: 6278dda h: refs/heads/master i: 278185: 0b3778c 278183: 5b0d5b7 v: v3
git-mirror · Nov 15, 2011 · 28e0465 · 28e0465
1 parent 17f20f4
commit 28e0465
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d4459a99c41e0e4fe7e36b3816b461c42827fb80
+refs/heads/master: 6278ddab9f859b8d6311879d35f2b1f74a789964
diff --git a/trunk/drivers/net/wireless/iwlegacy/3945-mac.c b/trunk/drivers/net/wireless/iwlegacy/3945-mac.c
@@ -2759,7 +2759,7 @@ void il3945_post_associate(struct il_priv *il)
 
 	il_scan_cancel_timeout(il, 200);
 
-	conf = il_ieee80211_get_hw_conf(il->hw);
+	conf = &il->hw->conf;
 
 	ctx->staging.filter_flags &= ~RXON_FILTER_ASSOC_MSK;
 	il3945_commit_rxon(il, ctx);

diff --git a/trunk/drivers/net/wireless/iwlegacy/4965.c b/trunk/drivers/net/wireless/iwlegacy/4965.c
@@ -2184,7 +2184,7 @@ static void il4965_post_associate(struct il_priv *il)
 
 	il_scan_cancel_timeout(il, 200);
 
-	conf = il_ieee80211_get_hw_conf(il->hw);
+	conf = &il->hw->conf;
 
 	ctx->staging.filter_flags &= ~RXON_FILTER_ASSOC_MSK;
 	il_commit_rxon(il, ctx);

diff --git a/trunk/drivers/net/wireless/iwlegacy/common.c b/trunk/drivers/net/wireless/iwlegacy/common.c
@@ -3514,7 +3514,7 @@ il_send_rxon_timing(struct il_priv *il, struct il_rxon_context *ctx)
 	u16 beacon_int;
 	struct ieee80211_vif *vif = ctx->vif;
 
-	conf = il_ieee80211_get_hw_conf(il->hw);
+	conf = &il->hw->conf;
 
 	lockdep_assert_held(&il->mutex);
 

diff --git a/trunk/drivers/net/wireless/iwlegacy/iwl-helpers.h b/trunk/drivers/net/wireless/iwlegacy/iwl-helpers.h
@@ -38,12 +38,6 @@
 #define IL_MASK(lo, hi) ((1 << (hi)) | ((1 << (hi)) - (1 << (lo))))
 
 
-static inline struct ieee80211_conf *il_ieee80211_get_hw_conf(
-	struct ieee80211_hw *hw)
-{
-	return &hw->conf;
-}
-
 /**
  * il_queue_inc_wrap - increment queue idx, wrap back to beginning
  * @idx -- current idx