summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenrik Brix Andersen <brix@gentoo.org>2004-10-29 12:13:49 +0000
committerHenrik Brix Andersen <brix@gentoo.org>2004-10-29 12:13:49 +0000
commit7b20399c0db1609f9105265e233d44392c7e265e (patch)
tree5261785838dc74b4663b57721f98102017159979 /net-wireless/ipw2100/files
parentUpdated to use existing mod_ssl for now (diff)
downloadhistorical-7b20399c0db1609f9105265e233d44392c7e265e.tar.gz
historical-7b20399c0db1609f9105265e233d44392c7e265e.tar.bz2
historical-7b20399c0db1609f9105265e233d44392c7e265e.zip
Update patches.
Diffstat (limited to 'net-wireless/ipw2100/files')
-rw-r--r--net-wireless/ipw2100/files/digest-ipw2100-0.56-r12
-rw-r--r--net-wireless/ipw2100/files/ipw2100-0.56-2.6.10-susp.patch47
2 files changed, 48 insertions, 1 deletions
diff --git a/net-wireless/ipw2100/files/digest-ipw2100-0.56-r1 b/net-wireless/ipw2100/files/digest-ipw2100-0.56-r1
index c33cf5be1ca0..917be95cb3b8 100644
--- a/net-wireless/ipw2100/files/digest-ipw2100-0.56-r1
+++ b/net-wireless/ipw2100/files/digest-ipw2100-0.56-r1
@@ -1,3 +1,3 @@
MD5 96473874bb682e2701c4e8e6dd662a64 ipw2100-0.56.tgz 132854
MD5 46aa75bcda1a00efa841f9707bbbd113 ipw2100-fw-1.3.tgz 248471
-MD5 8e0d061b2567361c76c3193aa342ec6f ipw2100-0.56-2.4-v1.patch.gz 8208
+MD5 34dc57c2a37acb3b613e907de16e0080 ipw2100-0.56-2.4-v7.patch.gz 8480
diff --git a/net-wireless/ipw2100/files/ipw2100-0.56-2.6.10-susp.patch b/net-wireless/ipw2100/files/ipw2100-0.56-2.6.10-susp.patch
new file mode 100644
index 000000000000..ed62a695d751
--- /dev/null
+++ b/net-wireless/ipw2100/files/ipw2100-0.56-2.6.10-susp.patch
@@ -0,0 +1,47 @@
+diff -urp ipw2100-0.56/ipw2100.c ipw2100-0.56/ipw2100.c
+--- ipw2100-0.56/ipw2100.c 2004-10-14 03:06:57.000000000 +0800
++++ ipw2100-0.56/ipw2100.c 2004-10-28 15:57:10.000000000 +0800
+@@ -6475,7 +6475,6 @@ static int ipw2100_pci_init_one(struct p
+ pci_write_config_dword(pdev, 0x40, val & 0xffff00ff);
+
+ pci_set_power_state(pdev, 0);
+- pci_restore_state(pdev, NULL);
+
+ if (!ipw2100_hw_is_adapter_in_system(dev)) {
+ err = -ENODEV;
+@@ -6666,8 +6665,9 @@ static int ipw2100_suspend(struct pci_de
+ /* Remove the PRESENT state of the device */
+ netif_device_detach(dev);
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)
+ pci_save_state(pdev, priv->pm_state);
+- pci_disable_device(pdev); // needed?
++#endif
+ pci_set_power_state(pdev, state);
+
+ return 0;
+@@ -6686,7 +6686,11 @@ static int ipw2100_resume(struct pci_dev
+ dev->name);
+
+ pci_set_power_state(pdev, 0);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)
+ pci_restore_state(pdev, priv->pm_state);
++#else
++ pci_restore_state(pdev);
++#endif
+
+ /*
+ * Suspend/Resume resets the PCI configuration space, so we have to
+diff -urp ipw2100-0.56/ipw2100.h ipw2100-0.56/ipw2100.h
+--- ipw2100-0.56/ipw2100.h 2004-10-14 03:06:57.000000000 +0800
++++ ipw2100-0.56/ipw2100.h 2004-10-27 11:16:36.000000000 +0800
+@@ -608,7 +608,9 @@ struct ipw2100_priv {
+ spinlock_t low_lock;
+
+ wait_queue_head_t wait_command_queue;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)
+ u32 pm_state[PM_STATE_SIZE];
++#endif
+ };
+
+