--- linux-2.6.18.noarch/drivers/net/wireless/iwlwifi/iwl-agn.c.orig	2008-10-17 11:36:08.000000000 -0400
+++ linux-2.6.18.noarch/drivers/net/wireless/iwlwifi/iwl-agn.c	2008-10-17 11:39:07.000000000 -0400
@@ -2960,10 +2960,9 @@ static void iwl4965_config_ap(struct iwl
 	 * clear sta table, add BCAST sta... */
 }
 
-#if 0 /* Not in RHEL5 */
 /* temporary */
-static int iwl4965_mac_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb);
-#endif
+static int iwl4965_mac_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb,
+				struct ieee80211_tx_control *control);
 
 static int iwl4965_mac_config_interface(struct ieee80211_hw *hw,
 					struct ieee80211_vif *vif,
@@ -3555,8 +3554,8 @@ static void iwl4965_mac_reset_tsf(struct
 	IWL_DEBUG_MAC80211("leave\n");
 }
 
-#if 0 /* Not in RHEL5 */
-static int iwl4965_mac_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb)
+static int iwl4965_mac_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb,
+				struct ieee80211_tx_control *control)
 {
 	struct iwl_priv *priv = hw->priv;
 	unsigned long flags;
@@ -3599,7 +3598,6 @@ static int iwl4965_mac_beacon_update(str
 
 	return 0;
 }
-#endif
 
 /*****************************************************************************
  *
@@ -4157,6 +4155,7 @@ static struct ieee80211_ops iwl4965_hw_o
 	.get_tx_stats = iwl4965_mac_get_tx_stats,
 	.conf_tx = iwl4965_mac_conf_tx,
 	.reset_tsf = iwl4965_mac_reset_tsf,
+	.beacon_update = iwl4965_mac_beacon_update,
 	.bss_info_changed = iwl4965_bss_info_changed,
 	.ampdu_action = iwl4965_mac_ampdu_action,
 	.hw_scan = iwl_mac_hw_scan