rpms/kernel/devel git-iwlwifi-fixes.patch, 1.3, 1.4 kernel-2.6.spec, 1.3112, 1.3113
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Apr 25 19:42:12 UTC 2007
Author: linville
Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28607
Modified Files:
git-iwlwifi-fixes.patch kernel-2.6.spec
Log Message:
fix iwlwifi build breakage
git-iwlwifi-fixes.patch:
base.c | 30 +++---------------------------
iwlwifi.h | 2 +-
2 files changed, 4 insertions(+), 28 deletions(-)
Index: git-iwlwifi-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/git-iwlwifi-fixes.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- git-iwlwifi-fixes.patch 11 Apr 2007 20:15:34 -0000 1.3
+++ git-iwlwifi-fixes.patch 25 Apr 2007 19:42:10 -0000 1.4
@@ -1,6 +1,64 @@
---- linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c.orig 2007-04-11 15:15:22.000000000 -0400
-+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c 2007-04-11 15:15:27.000000000 -0400
-@@ -12970,6 +12970,7 @@ static int ipw_pci_probe(struct pci_dev
+--- linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c.orig 2007-04-25 15:18:59.000000000 -0400
++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c 2007-04-25 15:27:43.000000000 -0400
+@@ -7599,7 +7599,6 @@ static void ipw_handle_data_packet(struc
+ short len = le16_to_cpu(rx_hdr->len);
+
+ /* We received data from the HW, so stop the watchdog */
+- ieee80211_netif_oper(priv->ieee, NETIF_UPDATE_TX_START);
+ if (unlikely((len + IPW_RX_FRAME_SIZE) > skb_tailroom(rxb->skb))) {
+ priv->wstats.discard.misc++;
+ IPW_DEBUG_DROP("Corruption detected! Oh no!\n");
+@@ -8238,10 +8237,6 @@ static int ipw_queue_tx_reclaim(struct i
+ is_next = 1;
+ }
+ done:
+- if (ipw_queue_space(q) > q->low_mark && (fifo >= 0)
+- && (fifo != priv->hw_setting.cmd_queue_no)
+- && priv->netdev_registered && netif_running(priv->net_dev))
+- ieee80211_netif_oper(priv->ieee, NETIF_WAKE);
+ used = q->first_empty - q->last_used;
+ if (used < 0)
+ used += q->n_window;
+@@ -9185,13 +9180,9 @@ static int d_open(struct ieee80211_hw *h
+ /* we should be verifying the device is ready to be opened */
+ mutex_lock(&priv->mutex);
+
+- if (priv->net_dev && !(priv->status & STATUS_RF_KILL_MASK)) {
+- ieee80211_netif_oper(priv->ieee, NETIF_ATTACH);
+- ieee80211_netif_oper(priv->ieee, NETIF_START);
+- ieee80211_netif_oper(priv->ieee, NETIF_WAKE);
++ if (priv->net_dev && !(priv->status & STATUS_RF_KILL_MASK))
+ netif_carrier_on(priv->net_dev);
+
+- }
+ mutex_unlock(&priv->mutex);
+ IPW_DEBUG_MAC80211("leave %p\n", hw);
+ return 0;
+@@ -9974,14 +9965,6 @@ static void ipw_link_up(struct ipw_priv
+ priv->last_frag_num = -1;
+ priv->last_packet_time = 0;
+
+- if (ieee80211_netif_oper(priv->ieee, NETIF_IS_STOPPED)) {
+- IPW_DEBUG_NOTIF("waking queue\n");
+- ieee80211_netif_oper(priv->ieee, NETIF_WAKE);
+- } else {
+- IPW_DEBUG_NOTIF("starting queue\n");
+- ieee80211_netif_oper(priv->ieee, NETIF_START);
+- }
+-
+ ipw_scan_cancel(priv);
+ ipw_reset_stats(priv);
+
+@@ -10247,7 +10230,7 @@ static int ipw_update_power_cmd(struct i
+ u8 period = 0;
+ struct ipw_power_mgr *pow_data;
+
+- if ((mode < IPW_POWER_MODE_CAM) || (mode > IPW_POWER_INDEX_5)) {
++ if (mode > IPW_POWER_INDEX_5) {
+ IPW_DEBUG_POWER("Error invalid power mode \n");
+ return -1;
+ }
+@@ -12970,6 +12953,7 @@ static int ipw_pci_probe(struct pci_dev
err = ipw_read_ucode(priv);
if (err) {
IPW_ERROR("Could not read microcode from disk: %d\n", err);
@@ -8,8 +66,30 @@
goto out_remove_sysfs;
}
---- linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/iwlwifi.h.orig 2007-04-11 15:17:53.000000000 -0400
-+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/iwlwifi.h 2007-04-11 15:18:59.000000000 -0400
+@@ -13154,9 +13138,6 @@ static int ipw_pci_suspend(struct pci_de
+ /* Take down the device; powers it off, etc. */
+ ipw_down(priv);
+
+- /* Remove the PRESENT state of the device */
+- if (priv->netdev_registered)
+- ieee80211_netif_oper(priv->ieee, NETIF_DETACH);
+ pci_save_state(pdev);
+ pci_disable_device(pdev);
+ pci_set_power_state(pdev, PCI_D3hot);
+@@ -13186,11 +13167,6 @@ static int ipw_pci_resume(struct pci_dev
+ */
+ pci_write_config_byte(pdev, 0x41, 0x00);
+
+- /* Set the device back into the PRESENT state; this will also wake
+- * the queue of needed */
+- if (priv->netdev_registered)
+- ieee80211_netif_oper(priv->ieee, NETIF_ATTACH);
+-
+ queue_delayed_work(priv->workqueue, &priv->resume_work, 3 * HZ);
+
+ mutex_unlock(&priv->mutex);
+--- linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/iwlwifi.h.orig 2007-04-25 15:18:59.000000000 -0400
++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/iwlwifi.h 2007-04-25 15:19:11.000000000 -0400
@@ -180,7 +180,7 @@ do { if (ipw_debug_level & (level)) \
#define IPW_DL_QOS (1<<31)
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3112
retrieving revision 1.3113
diff -u -r1.3112 -r1.3113
--- kernel-2.6.spec 25 Apr 2007 18:07:02 -0000 1.3112
+++ kernel-2.6.spec 25 Apr 2007 19:42:10 -0000 1.3113
@@ -2336,6 +2336,7 @@
* Wed Apr 25 2007 John W. Linville <linville at redhat.com>
- Update git-wireless-dev.patch
- Remove linux-2.6-bcm43xx-mac80211-phy-rev-1-fix.patch (obsoleted by above)
+- Update git-iwlwifi-fixes.patch to match new git-wireless-dev.patch
* Wed Apr 25 2007 Dave Jones <davej at redhat.com>
- 2.6.21-rc7-git8
More information about the fedora-cvs-commits
mailing list