rpms/kernel/F-7 0001-iwl3945-Fix-problem-with-limited-Tx-power.patch, NONE, 1.1.2.1 iwlwifi-0.0.32-patch, NONE, 1.1.2.1 kernel-2.6.spec, 1.3235, 1.3235.2.1

Bill Nottingham (notting) fedora-extras-commits at redhat.com
Fri Jun 22 00:11:17 UTC 2007


Author: notting

Update of /cvs/extras/rpms/kernel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3980

Modified Files:
      Tag: private-notting-iwl-branch
	kernel-2.6.spec 
Added Files:
      Tag: private-notting-iwl-branch
	0001-iwl3945-Fix-problem-with-limited-Tx-power.patch 
	iwlwifi-0.0.32-patch 
Log Message:
update iwlwifi to 0.0.32, add patch from upstream


0001-iwl3945-Fix-problem-with-limited-Tx-power.patch:

--- NEW FILE 0001-iwl3945-Fix-problem-with-limited-Tx-power.patch ---
>From 5bf92fa3bd520ed8fe47d05835fe207d7a89e695 Mon Sep 17 00:00:00 2001
From: James Ketrenos <jketreno at linux.intel.com>
Date: Thu, 21 Jun 2007 16:16:56 -0700
Subject: [PATCH] iwl3945: Fix problem with limited Tx power

The temperature value in the EEPROM table is s16, however there is no
signed __le16 counterpart, so the entry was set to __le16.  This
introduced a casting problem on 64-bit systems when it was being cast to
an int as a value of 65535 mapped to that vs. -1.

This commit changes all references to the temperature from the EEPROM
map to be cast to s16 explicitely.  It also adds le16_to_cpu() wrappers
around the usage.

Signed-off-by: James Ketrenos <jketreno at linux.intel.com>
---
 origin/iwl-3945.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/net/wireless/mac80211/iwlwifi/iwl-3945.c b/drivers/net/wireless/mac80211/iwlwifi/iwl-3945.c
index ebb59e4..1130cf6 100644
--- a/drivers/net/wireless/mac80211/iwlwifi/iwl-3945.c
+++ b/drivers/net/wireless/mac80211/iwlwifi/iwl-3945.c
@@ -1341,7 +1341,7 @@ static int reg_txpower_get_temperature(struct iwl_priv *priv)
 		 *   substitute the 3rd band/group's temp measured at factory */
 		if (priv->last_temperature > 100)
 			temperature =
-			    le16_to_cpu(priv->eeprom.groups[2].temperature);
+				(s16)le16_to_cpu(priv->eeprom.groups[2].temperature);
 		else /* else use most recent "sane" value from driver */
 			temperature = priv->last_temperature;
 	}
@@ -1802,7 +1802,7 @@ static int reg_txpower_compensate_for_temperature_dif(struct iwl_priv *priv)
 		a_band = is_channel_a_band(ch_info);
 
 		/* Get this chnlgrp's factory calibration temperature */
-		ref_temp = priv->eeprom.groups[ch_info->group_index].
+		ref_temp = (s16)priv->eeprom.groups[ch_info->group_index].
 		    temperature;
 
 		/* get power index adjustment based on curr and factory
@@ -2135,7 +2135,9 @@ int iwl3945_txpower_set_from_eeprom(struct iwl_priv *priv)
 		 *  diff between current temperature and factory temperature */
 		delta_index = reg_adjust_power_by_temp(
 			temperature,
-			priv->eeprom.groups[ch_info->group_index].temperature);
+			(s16)le16_to_cpu(
+				priv->eeprom.groups[ch_info->group_index].temperature));
+
 		IWL_DEBUG_POWER("Delta index for channel %d: %d [%d]\n",
 				ch_info->channel, delta_index, temperature +
 				IWL_TEMP_CONVERT);
@@ -2144,7 +2146,6 @@ int iwl3945_txpower_set_from_eeprom(struct iwl_priv *priv)
 		for (rate_index = 0; rate_index < IWL_OFDM_RATES;
 		     rate_index++) {
 			s32 power_idx;
-			s32 old_power_idx;
 			int rc;
 
 			/* use channel group's clip-power table,
@@ -2167,7 +2168,6 @@ int iwl3945_txpower_set_from_eeprom(struct iwl_priv *priv)
 
 			/* temperature compensate */
 			power_idx += delta_index;
-			old_power_idx = power_idx;
 
 			/* stay within range of gain table */
 			power_idx = reg_fix_power_index(power_idx);
-- 
1.5.2.2



--- NEW FILE iwlwifi-0.0.32-patch ---
diff -ru linux-2.6.21.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c linux-2.6.21.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c
--- linux-2.6.21.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c	2007-06-21 15:03:21.000000000 -0400
+++ linux-2.6.21.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c	2007-06-18 05:10:17.000000000 -0400
@@ -107,7 +107,7 @@
 #define VS
 #endif
 
-#define IWLWIFI_VERSION "0.0.25k" VD VS
+#define IWLWIFI_VERSION "0.0.32" VD VS
 #define DRV_COPYRIGHT	"Copyright(c) 2003-2007 Intel Corporation"
 #define DRV_VERSION     IWLWIFI_VERSION
 
@@ -215,10 +215,9 @@
 	} else
 		txq->txb = NULL;
 
-	txq->bd = (u8 *)
-	    pci_alloc_consistent(dev,
-				 sizeof(struct iwl_tfd_frame) *
-				 TFD_QUEUE_SIZE_MAX, &txq->q.dma_addr);
+	txq->bd = pci_alloc_consistent(dev,
+			sizeof(struct iwl_tfd_frame) * TFD_QUEUE_SIZE_MAX,
+			&txq->q.dma_addr);
 
 	txq->q.element_size = sizeof(struct iwl_tfd_frame);
 	if (!txq->bd) {
@@ -423,7 +422,8 @@
 	 * all TID's disabled
 	 *  priv->stations[i].sta.tid_disable_tx = 0xffff;
 	 */
-	if (priv->phymode == MODE_IEEE80211A)
+	if ((priv->phymode == MODE_IEEE80211A) ||
+	    (priv->phymode == MODE_ATHEROS_TURBO))
 		station->sta.tx_rate.rate_n_flags = IWL_RATE_6M_PLCP;
 	else
 		station->sta.tx_rate.rate_n_flags = IWL_RATE_1M_PLCP |
@@ -557,6 +557,9 @@
 #if IWL == 3945
 		IWL_CMD(REPLY_3945_RX);
 #elif IWL == 4965
+		IWL_CMD(MISSED_BEACONS_NOTIFICATION_TH_CMD);
+		IWL_CMD(REPLY_CT_KILL_CONFIG_CMD);
+		IWL_CMD(SENSITIVITY_CMD);
 		IWL_CMD(REPLY_RX_MPDU_CMD);
 		IWL_CMD(REPLY_RX_PHY_CMD);
 		IWL_CMD(REPLY_4965_RX);
@@ -889,7 +892,8 @@
 		return 0;
 
 	priv->staging_rxon.channel = channel;
-	if (phymode == MODE_IEEE80211A)
+	if ((phymode == MODE_IEEE80211A) ||
+	    (phymode == MODE_ATHEROS_TURBO))
 		priv->staging_rxon.flags &= ~RXON_FLG_BAND_24G_MSK;
 	else
 		priv->staging_rxon.flags |= RXON_FLG_BAND_24G_MSK;
@@ -1028,7 +1032,8 @@
 {
 
 	/* These items are only settable from the full RXON command */
-	if (compare_ether_addr(priv->staging_rxon.bssid_addr,
+	if (!(priv->active_rxon.filter_flags & RXON_FILTER_ASSOC_MSK) ||
+	    compare_ether_addr(priv->staging_rxon.bssid_addr,
 			       priv->active_rxon.bssid_addr) ||
 	    compare_ether_addr(priv->staging_rxon.node_addr,
 			       priv->active_rxon.node_addr) ||
@@ -1814,10 +1819,12 @@
 	return ret_rates;
 }
 
+#if IWL == 4965
 #ifdef CONFIG_IWLWIFI_HT
-void d_get_ht_capab (struct ieee80211_hw *hw,
+void static d_get_ht_capab (struct ieee80211_hw *hw,
 		     struct ieee80211_ht_capability *ht_cap_param);
 #endif
+#endif
 
 /**
  * iwl_fill_probe_req - fill in all required fields and IE for probe request
@@ -2323,7 +2330,8 @@
 
 static void iwl_set_flags_for_phymode(struct iwl_priv *priv, u8 phymode)
 {
-	if (phymode == MODE_IEEE80211A) {
+	if ((phymode == MODE_IEEE80211A) ||
+	    (phymode == MODE_ATHEROS_TURBO)) {
 		priv->staging_rxon.flags &=
 		    ~(RXON_FLG_BAND_24G_MSK | RXON_FLG_AUTO_DETECT_MSK
 		      | RXON_FLG_CCK_MSK);
@@ -2400,7 +2408,8 @@
 
 	iwl_set_flags_for_phymode(priv, priv->phymode);
 
-	priv->staging_rxon.ofdm_basic_rates = IWL_OFDM_RATES_MASK;
+	priv->staging_rxon.ofdm_basic_rates =
+	    (IWL_OFDM_RATES_MASK >> IWL_FIRST_OFDM_RATE) & 0xFF;
 	priv->staging_rxon.cck_basic_rates =
 	    (IWL_CCK_RATES_MASK >> IWL_FIRST_CCK_RATE) & 0xF;
 
@@ -2848,7 +2857,8 @@
 	priv->active_rate_basic = 0;
 
 	IWL_DEBUG_RATE("Setting rates for 802.11%c\n",
-		       (hw->mode == MODE_IEEE80211A) ?
+		       ((hw->mode == MODE_IEEE80211A) ||
+			(hw->mode == MODE_ATHEROS_TURBO)) ?
 		       'a' : ((hw->mode == MODE_IEEE80211B) ? 'b' : 'g'));
 
 	for (i = 0; i < hw->num_rates; i++) {
@@ -2886,10 +2896,12 @@
 
 	if (priv->active_rate_basic & IWL_OFDM_BASIC_RATES_MASK)
 		priv->staging_rxon.ofdm_basic_rates =
-		    (priv->active_rate_basic &
-		     IWL_OFDM_BASIC_RATES_MASK) | IWL_RATE_6M_MASK;
+		    ((priv->active_rate_basic &
+		      (IWL_OFDM_BASIC_RATES_MASK | IWL_RATE_6M_MASK)) >>
+		      IWL_FIRST_OFDM_RATE) & 0xFF;
 	else
-		priv->staging_rxon.ofdm_basic_rates = IWL_OFDM_BASIC_RATES_MASK;
+		priv->staging_rxon.ofdm_basic_rates =
+		   (IWL_OFDM_BASIC_RATES_MASK >> IWL_FIRST_OFDM_RATE) & 0xFF;
 }
 
 static void iwl_radio_kill_sw(struct iwl_priv *priv, int disable_radio)
@@ -4091,7 +4103,7 @@
 		rxb = rxq->queue[i];
 
 		/* If an RXB doesn't have a queue slot associated with it
-		 * then a bug has been introduce in the queue refilling
+		 * then a bug has been introduced in the queue refilling
 		 * routines -- catch it here */
 		BUG_ON(rxb == NULL);
 
@@ -4109,12 +4121,16 @@
 #endif
 			(pkt->hdr.cmd != REPLY_TX);
 
-		if (priv->rx_handlers[pkt->hdr.cmd])
+		if (priv->rx_handlers[pkt->hdr.cmd]) {
 			priv->rx_handlers[pkt->hdr.cmd] (priv, rxb);
-		else
+			IWL_DEBUG(IWL_DL_RX | IWL_DL_ISR,
+				"r = %d, i = %d, rx_handler %s\n", r, i,
+				get_cmd_string(pkt->hdr.cmd));
+		} else {
 			IWL_DEBUG_HC("UNHANDLED - #0x%02x %s\n",
 				     pkt->hdr.cmd,
 				     get_cmd_string(pkt->hdr.cmd));
+		}
 
 		if (reclaim) {
 			/* Invoke any callbacks, transfer the skb to
@@ -4218,21 +4234,23 @@
 
 static void iwl_enable_interrupts(struct iwl_priv *priv)
 {
-	if (priv->status & STATUS_INT_ENABLED)
-		return;
+	IWL_DEBUG_ISR("Enabling interrupts\n");
 	priv->status |= STATUS_INT_ENABLED;
 	iwl_write32(priv, CSR_INT_MASK, CSR_INI_SET_MASK);
 }
 
 static inline void iwl_disable_interrupts(struct iwl_priv *priv)
 {
-	if (!(priv->status & STATUS_INT_ENABLED))
-		return;
 	priv->status &= ~STATUS_INT_ENABLED;
+
+	/* disable interrupts from uCode/NIC to host */
 	iwl_write32(priv, CSR_INT_MASK, 0x00000000);
-	iwl_write32(priv, CSR_INT, CSR_INI_SET_MASK);
-	iwl_write32(priv, CSR_FH_INT_STATUS, 0xff);
-	iwl_write32(priv, CSR_FH_INT_STATUS, 0x00070000);
+
+	/* acknowledge/clear/reset any interrupts still pending
+	 * from uCode or flow handler (Rx/Tx DMA) */
+	iwl_write32(priv, CSR_INT, 0xffffffff);
+	iwl_write32(priv, CSR_FH_INT_STATUS, 0xffffffff);
+	IWL_DEBUG_ISR("Disabled interrupts\n");
 }
 
 static const char *desc_lookup(int i)
@@ -4496,22 +4514,42 @@
 static void iwl_irq_tasklet(struct iwl_priv *priv)
 {
 	u32 inta, inta_mask, handled = 0;
+	u32 inta_fh;
 	unsigned long flags;
 
 	spin_lock_irqsave(&priv->lock, flags);
 
+	/* Ack/clear/reset pending uCode interrupts.
+	 * Note:  Some bits in CSR_INT are "OR" of bits in CSR_FH_INT_STATUS,
+	 *  and will clear only when CSR_FH_INT_STATUS gets cleared. */
 	inta = iwl_read32(priv, CSR_INT);
-	inta_mask = iwl_read32(priv, CSR_INT_MASK);
[...1640 lines suppressed...]
+/* interrupt flags in INTA, set by uCode or hardware (e.g. dma),
+ * acknowledged (reset) by host writing "1" to flagged bits. */
+#define BIT_INT_FH_RX        (1<<31) /* Rx DMA, cmd responses, FH_INT[17:16] */
+#define BIT_INT_ERR          (1<<29) /* DMA hardware error FH_INT[31] */
+#define BIT_INT_FH_TX        (1<<27) /* Tx DMA FH_INT[1:0] */
+#define BIT_INT_MAC_CLK_ACTV (1<<26) /* NIC controller's clock toggled on/off */
+#define BIT_INT_SWERROR      (1<<25) /* uCode error */
+#define BIT_INT_RF_KILL      (1<<7)  /* HW RFKILL switch GP_CNTRL[27] toggled */
+#define BIT_INT_CT_KILL      (1<<6)  /* Critical temp (chip too hot) rfkill */
+#define BIT_INT_SW_RX        (1<<3)  /* Rx, command responses, 3945 */
+#define BIT_INT_WAKEUP       (1<<1)  /* NIC controller waking up (pwr mgmt) */
+#define BIT_INT_ALIVE        (1<<0)  /* uCode interrupts once it initializes */
+
+#define CSR_INI_SET_MASK      ( BIT_INT_FH_RX   |  \
 				BIT_INT_ERR     |  \
-				BIT_INT_TX      |  \
-				BIT_INT_ALIVE   |  \
-				BIT_INT_WAKEUP )
+				BIT_INT_FH_TX   |  \
+				BIT_INT_SWERROR |  \
+				BIT_INT_SW_RX   |  \
+				BIT_INT_WAKEUP  |  \
+				BIT_INT_ALIVE )
+
+/* interrupt flags in FH (flow handler) (PCI busmaster DMA) */
+#define BIT_FH_INT_ERR       (1<<31) /* Error */
+#define BIT_FH_INT_HI_PRIOR  (1<<30) /* High priority Rx, bypass coalescing */
+#define BIT_FH_INT_RX_CHNL2  (1<<18) /* Rx channel 2 (3945 only) */
+#define BIT_FH_INT_RX_CHNL1  (1<<17) /* Rx channel 1 */
+#define BIT_FH_INT_RX_CHNL0  (1<<16) /* Rx channel 0 */
+#define BIT_FH_INT_TX_CHNL6  (1<<6)  /* Tx channel 6 (3945 only) */
+#define BIT_FH_INT_TX_CHNL1  (1<<1)  /* Tx channel 1 */
+#define BIT_FH_INT_TX_CHNL0  (1<<0)  /* Tx channel 0 */
+
+#define FH_INT_RX_MASK        ( BIT_FH_INT_HI_PRIOR |  \
+				BIT_FH_INT_RX_CHNL2 |  \
+				BIT_FH_INT_RX_CHNL1 |  \
+				BIT_FH_INT_RX_CHNL0 )
+
+#define FH_INT_TX_MASK        ( BIT_FH_INT_TX_CHNL6 |  \
+				BIT_FH_INT_TX_CHNL1 |  \
+				BIT_FH_INT_TX_CHNL0 )
 
 /* RESET */
 #define CSR_RESET_REG_FLAG_NEVO_RESET                (0x00000001)
@@ -1434,6 +1460,7 @@
 		struct iwl_notif_statistics stats;
 #if IWL == 4965
 		struct iwl_compressed_ba_resp compressed_ba;
+		struct iwl_missed_beacon_notif missed_beacon;
 #endif
 		__le32 status;
 		u8 raw[0];
diff -ru linux-2.6.21.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-priv.h linux-2.6.21.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-priv.h
--- linux-2.6.21.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-priv.h	2007-06-21 15:03:21.000000000 -0400
+++ linux-2.6.21.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-priv.h	2007-06-17 22:43:11.000000000 -0400
@@ -141,17 +141,17 @@
 	u16 active_rate_basic;
 
 #if IWL == 4965
+	u8 use_ant_b_for_management_frame;
 	/* HT variables */
 	u8 is_dup;
 	u8 is_ht_enabled;
 	u8 channel_width;	/* 0=20MHZ, 1=40MHZ */
-	u8 operation_mode;
-	u8 mimo_ps_mode;
-	u8 ext_channel_offset;
 	u8 current_channel_width;
 	u8 valid_antenna;
+#ifdef CONFIG_IWLWIFI_SENSITIVITY
 	struct iwl_sensitivity_data sensitivity_data;
 	struct iwl_chain_noise_data chain_noise_data;
+#endif /*CONFIG_IWLWIFI_SENSITIVITY*/
 
 #ifdef CONFIG_IWLWIFI_HT
 	struct sta_ht_info current_assoc_ht;
@@ -266,7 +266,6 @@
 	struct delayed_work thermal_periodic;
 	struct delayed_work gather_stats;
 	struct delayed_work scan_check;
-	struct delayed_work resume_work;
 
 #define IWL_DEFAULT_TX_POWER 0x0F
 	s8 user_txpower_limit;
@@ -277,9 +276,6 @@
 	u32 pm_state[16];
 #endif
 
-	/* Used to pass the current INTA value from ISR to Tasklet */
-	u32 isr_inta;
-
 	/* debugging info */
 	u32 framecnt_to_us;
 
@@ -287,7 +283,9 @@
 
 #if IWL == 4965
 	struct work_struct txpower_work;
+#ifdef CONFIG_IWLWIFI_SENSITIVITY
 	struct work_struct sensitivity_work;
+#endif
 	struct work_struct statistics_work;
 	struct delayed_work init_alive_start;
 
diff -ru linux-2.6.21.noarch/drivers/net/wireless/mac80211/iwlwifi/iwlwifi.h linux-2.6.21.noarch/drivers/net/wireless/mac80211/iwlwifi/iwlwifi.h
--- linux-2.6.21.noarch/drivers/net/wireless/mac80211/iwlwifi/iwlwifi.h	2007-06-21 15:03:21.000000000 -0400
+++ linux-2.6.21.noarch/drivers/net/wireless/mac80211/iwlwifi/iwlwifi.h	2007-06-11 22:40:14.000000000 -0400
@@ -625,8 +625,6 @@
 extern int iwl_hw_get_temperature(struct iwl_priv *priv);
 extern int iwl_tx_queue_free_tfd(struct iwl_priv *priv,
 				 struct iwl_tx_queue *txq);
-extern int iwl_hw_tx_queue_alloc(struct iwl_priv *priv,
-				 struct iwl_tx_queue *q, int count, u32 id);
 extern int iwl_hw_tx_queue_init(struct iwl_priv *priv,
 				struct iwl_tx_queue *txq);
 extern int iwl_hw_get_beacon_cmd(struct iwl_priv *priv,
diff -ru linux-2.6.21.noarch/drivers/net/wireless/mac80211/iwlwifi/Kconfig linux-2.6.21.noarch/drivers/net/wireless/mac80211/iwlwifi/Kconfig
--- linux-2.6.21.noarch/drivers/net/wireless/mac80211/iwlwifi/Kconfig	2007-06-21 15:03:21.000000000 -0400
+++ linux-2.6.21.noarch/drivers/net/wireless/mac80211/iwlwifi/Kconfig	2007-06-14 22:17:03.000000000 -0400
@@ -4,12 +4,12 @@
 	select FW_LOADER
 	default n
 	---help---
-	  Select to enable drivers based on the iwlwifi project.  This
-	  project provides a common foundation for Intel's wireless
+	  Select to enable drivers based on the iwlwifi project.  This 
+	  project provides a common foundation for Intel's wireless 
 	  drivers designed to use the mac80211 subsystem.
 
-	  See <file:Documentation/networking/README.iwlwifi> for
-	  information on the capabilities currently enabled in this
+	  See <file:Documentation/networking/README.iwlwifi> for 
+	  information on the capabilities currently enabled in this 
 	  driver and for tips for debugging issues and problems.
 
 config IWLWIFI_DEBUG
@@ -17,14 +17,14 @@
 	depends on IWLWIFI
 	default y
 	---help---
-	  This option will enable debug tracing output for the iwlwifi
-	  drivers.
+	  This option will enable debug tracing output for the iwlwifi 
+	  drivers.  
 
-	  This will result in the kernel module being ~100k larger.  You can
-	  control which debug output is sent to the kernel log by setting the
-	  value in
+	  This will result in the kernel module being ~100k larger.  You can 
+	  control which debug output is sent to the kernel log by setting the 
+	  value in 
 
-	          /sys/bus/pci/drivers/${DRIVER}/debug_level
+	  	/sys/bus/pci/drivers/${DRIVER}/debug_level
 
 	  This entry will only exist if this option is enabled.
 
@@ -50,16 +50,16 @@
 
 	  This driver uses the kernel's mac80211 subsystem.
 
-	  See <file:Documentation/networking/README.iwlwifi> for
-	  information on the capabilities currently enabled in this
+	  See <file:Documentation/networking/README.iwlwifi> for 
+	  information on the capabilities currently enabled in this 
 	  driver and for tips for debugging any issues or problems.
 
 	  In order to use this driver, you will need a microcode (uCode)
 	  image for it. You can obtain the microcode from:
 
-	          <http://intellinuxwireless.org/>.
+	  	<http://intellinuxwireless.org/>.  
 
-	  See the above referenced README.iwlwifi for information on where
+	  See the above referenced README.iwlwifi for information on where 
 	  to install the microcode images.
 
 	  If you want to compile the driver as a module ( = code which can be
@@ -78,16 +78,16 @@
 
 	  This driver uses the kernel's mac80211 subsystem.
 
-	  See <file:Documentation/networking/README.iwlwifi> for
-	  information on the capabilities currently enabled in this
+	  See <file:Documentation/networking/README.iwlwifi> for 
+	  information on the capabilities currently enabled in this 
 	  driver and for tips for debugging any issues or problems.
 
 	  In order to use this driver, you will need a microcode (uCode)
 	  image for it. You can obtain the microcode from:
 
-	          <http://intellinuxwireless.org/>.
+	  	<http://intellinuxwireless.org/>.  
 
-	  See the above referenced README.iwlwifi for information on where
+	  See the above referenced README.iwlwifi for information on where 
 	  to install the microcode images.
 
 	  If you want to compile the driver as a module ( = code which can be


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/extras/rpms/kernel/F-7/kernel-2.6.spec,v
retrieving revision 1.3235
retrieving revision 1.3235.2.1
diff -u -r1.3235 -r1.3235.2.1
--- kernel-2.6.spec	21 Jun 2007 03:40:40 -0000	1.3235
+++ kernel-2.6.spec	22 Jun 2007 00:10:40 -0000	1.3235.2.1
@@ -59,7 +59,7 @@
 # that the kernel isn't the stock distribution kernel, for example,
 # by setting the define to ".local" or ".bz123456"
 #
-#% define buildid .local
+%define buildid .iwl0.0.32
 %define sublevel 21
 %define kversion 2.6.%{sublevel}
 %define rpmversion 2.6.%{sublevel}
@@ -640,6 +640,8 @@
 Patch2300: linux-2.6-wireless.patch
 Patch2301: git-wireless-dev.patch
 Patch2302: linux-2.6-bcm43xx-pci-neuter.patch
+Patch2303: iwlwifi-0.0.32-patch
+Patch2304: 0001-iwl3945-Fix-problem-with-limited-Tx-power.patch
 
 # Assorted dyntick/clock/timer fixes.
 Patch2402: linux-2.6-acpi-keep-tsc-stable-when-lapic-timer-c2-ok-is-set.patch
@@ -1436,6 +1438,10 @@
 %patch2301 -p1
 # avoid bcm43xx vs bcm43xx-mac80211 PCI ID conflicts
 %patch2302 -p1
+# update iwlwifi to 0.0.32
+%patch2303 -p1
+# fix iwl3945 (http://bughost.org/bugzilla/show_bug.cgi?id=1336)
+%patch2304 -p1
 
 # Assorted dyntick/clock/timer fixes.
 %patch2402 -p1
@@ -2420,6 +2426,10 @@
 %endif
 
 %changelog
+* Thu Jun 21 2007 Bill Nottingham <notting at redhat.com>
+- update iwlwifi to 0.0.32
+- add iwl3945 patch from upstream for random dropouts
+
 * Tue Jun 19 2007 Chuck Ebbert <cebbert at redhat.com>
 - ATA spindown patches (bz #243021)
 




More information about the fedora-extras-commits mailing list