Update compat-wireless to 2.6.36-5-spn

chromeos/compat-wireless/drivers/net/wireless/ipw2x00/ipw2100.c

 /******************************************************************************
 
   Copyright(c) 2003 - 2006 Intel Corporation. All rights reserved.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms of version 2 of the GNU General Public License as
   published by the Free Software Foundation.
 
   This program is distributed in the hope that it will be useful, but WITHOUT
   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ skipping 2722 matching lines @@
         }
 
         i = (rxq->next + 1) % rxq->entries;
         s = i;
         while (i != r) {
                 /* IPW_DEBUG_RX("r = %d : w = %d : processing = %d\n",
                    r, rxq->next, i); */
 
                 packet = &priv->rx_buffers[i];
 
-                /* Sync the DMA for the STATUS buffer so CPU is sure to get
-                 * the correct values */
-                pci_dma_sync_single_for_cpu(priv->pci_dev,
-                                            sq->nic +
-                                            sizeof(struct ipw2100_status) * i,
-                                            sizeof(struct ipw2100_status),
-                                            PCI_DMA_FROMDEVICE);
-
                 /* Sync the DMA for the RX buffer so CPU is sure to get
                  * the correct values */
                 pci_dma_sync_single_for_cpu(priv->pci_dev, packet->dma_addr,
                                             sizeof(struct ipw2100_rx),
                                             PCI_DMA_FROMDEVICE);
 
                 if (unlikely(ipw2100_corruption_check(priv, i))) {
                         ipw2100_corruption_detected(priv, i);
                         goto increment;
                 }
@@ skipping 3918 matching lines @@
  * or we risk an unlikely race condition on someone accessing
  * uninitialized data in the PCI dev struct through /proc.
  */
 static int __init ipw2100_init(void)
 {
         int ret;
 
         printk(KERN_INFO DRV_NAME ": %s, %s\n", DRV_DESCRIPTION, DRV_VERSION);
         printk(KERN_INFO DRV_NAME ": %s\n", DRV_COPYRIGHT);
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36))
+        pm_qos_add_request(&ipw2100_pm_qos_req, PM_QOS_CPU_DMA_LATENCY,
+                           PM_QOS_DEFAULT_VALUE);
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
+       ipw2100_pm_qos_req = pm_qos_add_request(PM_QOS_CPU_DMA_LATENCY,
+                                               PM_QOS_DEFAULT_VALUE);
+#else
+        pm_qos_add_requirement(PM_QOS_CPU_DMA_LATENCY, "ipw2100",
+                               PM_QOS_DEFAULT_VALUE);
+#endif
+
         ret = pci_register_driver(&ipw2100_pci_driver);
         if (ret)
                 goto out;
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36))
-        pm_qos_add_request(&ipw2100_pm_qos_req, PM_QOS_CPU_DMA_LATENCY,
-                           PM_QOS_DEFAULT_VALUE);
-#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
-        ipw2100_pm_qos_req = pm_qos_add_request(PM_QOS_CPU_DMA_LATENCY,
-                                                PM_QOS_DEFAULT_VALUE);
-#else
-        pm_qos_add_requirement(PM_QOS_CPU_DMA_LATENCY, "ipw2100",
-                               PM_QOS_DEFAULT_VALUE);
-#endif
 #ifdef CONFIG_IPW2100_DEBUG
         ipw2100_debug_level = debug;
         ret = driver_create_file(&ipw2100_pci_driver.driver,
                                  &driver_attr_debug_level);
 #endif
 
 out:
         return ret;
 }
 
@@ skipping 2067 matching lines @@
         if (i == 30) {
                 printk(KERN_ERR DRV_NAME
                        ": %s: No response from Symbol - hw not alive\n",
                        dev->name);
                 printk_buf(IPW_DL_ERROR, (u8 *) & response, sizeof(response));
                 return -EIO;
         }
 
         return 0;
 }