lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

This removes support for old (and non-mainline) kernels from ipw2200.

Browse Source 
Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Jiri Benc <jbenc@suse.cz>
This commit is contained in:
Jiri Benc
2005-08-25 20:08:22 -04:00
committed by Jeff Garzik
parent 3ce329cec2
commit 771abed990
2 changed files with 0 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/wireless/ipw2200.c
View File

@@ -6617,11 +6617,7 @@ static int ipw_setup_deferred_work(struct ipw_priv *priv)
{ {
int ret = 0; int ret = 0;
#ifdef CONFIG_SOFTWARE_SUSPEND2
priv->workqueue = create_workqueue(DRV_NAME, 0);
#else
priv->workqueue = create_workqueue(DRV_NAME); priv->workqueue = create_workqueue(DRV_NAME);
#endif
init_waitqueue_head(&priv->wait_command_queue); init_waitqueue_head(&priv->wait_command_queue);
INIT_WORK(&priv->adhoc_check, ipw_adhoc_check, priv); INIT_WORK(&priv->adhoc_check, ipw_adhoc_check, priv);
@@ -7242,11 +7238,7 @@ static int ipw_pci_suspend(struct pci_dev *pdev, u32 state)
/* Remove the PRESENT state of the device */ /* Remove the PRESENT state of the device */
netif_device_detach(dev); netif_device_detach(dev);
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)
pci_save_state(pdev, priv->pm_state);
#else
pci_save_state(pdev); pci_save_state(pdev);
#endif
pci_disable_device(pdev); pci_disable_device(pdev);
pci_set_power_state(pdev, state); pci_set_power_state(pdev, state);

20
drivers/net/wireless/ipw2200.h
View File

@@ -53,26 +53,6 @@
#include <linux/workqueue.h> #include <linux/workqueue.h>
#ifndef IRQ_NONE
typedef void irqreturn_t;
#define IRQ_NONE
#define IRQ_HANDLED
#define IRQ_RETVAL(x)
#endif
#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,9) )
#define __iomem
#endif
#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,5) )
#define pci_dma_sync_single_for_cpu pci_dma_sync_single
#define pci_dma_sync_single_for_device pci_dma_sync_single
#endif
#ifndef HAVE_FREE_NETDEV
#define free_netdev(x) kfree(x)
#endif
/* Authentication and Association States */ /* Authentication and Association States */
enum connection_manager_assoc_states enum connection_manager_assoc_states
{ {