package/acx-mac80211/patches/004-vlynq_fixes.patch

   1 Index: acx-mac80211-20100302/pci.c
   2 ===================================================================
   3 --- acx-mac80211-20100302.orig/pci.c    2010-03-06 22:22:02.000000000 +0100
   4 +++ acx-mac80211-20100302/pci.c 2010-03-06 22:22:29.000000000 +0100
   5 @@ -4309,7 +4309,7 @@
   6         addr = (u32)ioremap(vdev->mem_start, 0x1000);
   7         if (!addr) {
   8                 printk(KERN_ERR "acx: %s: failed to remap io memory\n",
   9 -                      vdev->dev.bus_id);
  10 +                      dev_name(&vdev->dev));
  11                 result = -ENXIO;
  12                 goto fail;
  13         }
  14 @@ -4323,7 +4323,7 @@
  15         ieee = ieee80211_alloc_hw(sizeof(struct acx_device), &acxpci_hw_ops);
  16         if (!ieee) {
  17                 printk("acx: could not allocate ieee80211 structure %s\n",
  18 -                      vdev->dev.bus_id);
  19 +                      dev_name(&vdev->dev));
  20                 goto fail_alloc_netdev;
  21         }
  22         ieee->flags &=   ~IEEE80211_HW_RX_INCLUDES_FCS;
  23 @@ -4365,7 +4365,7 @@
  24
  25         printk("acx: found %s-based wireless network card at %s, irq:%d, "
  26                "phymem:0x%x, mem:0x%p\n",
  27 -              match->name, vdev->dev.bus_id, adev->irq,
  28 +              match->name, dev_name(&vdev->dev), adev->irq,
  29                vdev->mem_start, adev->iobase);
  30         log(L_ANY, "acx: the initial debug setting is 0x%04X\n", acx_debug);
  31
  32 @@ -4416,7 +4416,7 @@
  33          * firmware operations happening in parallel or uninitialized data */
  34
  35
  36 -       acx_proc_register_entries(ieee);
  37 +       acx_proc_register_entries(ieee, 0);
  38
  39         /* Now we have our device, so make sure the kernel doesn't try
  40          * to send packets even though we're not associated to a network yet */
  41 @@ -4536,7 +4536,7 @@
  42                 CLEAR_BIT(adev->dev_state_mask, ACX_STATE_IFACE_UP);
  43         }
  44
  45 -       acx_proc_unregister_entries(adev->ieee);
  46 +       acx_proc_unregister_entries(adev->ieee, 0);
  47
  48         /* finally, clean up PCI bus state */
  49         acxpci_s_delete_dma_regions(adev);