summaryrefslogtreecommitdiff
path: root/package/acx-mac80211/patches/004-vlynq_fixes.patch
diff options
context:
space:
mode:
Diffstat (limited to 'package/acx-mac80211/patches/004-vlynq_fixes.patch')
-rw-r--r--package/acx-mac80211/patches/004-vlynq_fixes.patch16
1 files changed, 7 insertions, 9 deletions
diff --git a/package/acx-mac80211/patches/004-vlynq_fixes.patch b/package/acx-mac80211/patches/004-vlynq_fixes.patch
index 011c67d84a..3e1a8bbc6c 100644
--- a/package/acx-mac80211/patches/004-vlynq_fixes.patch
+++ b/package/acx-mac80211/patches/004-vlynq_fixes.patch
@@ -1,8 +1,6 @@
-Index: acx-mac80211-20100302/pci.c
-===================================================================
---- acx-mac80211-20100302.orig/pci.c 2010-03-06 22:22:02.000000000 +0100
-+++ acx-mac80211-20100302/pci.c 2010-03-06 22:22:29.000000000 +0100
-@@ -4309,7 +4309,7 @@
+--- a/pci.c
++++ b/pci.c
+@@ -4309,7 +4309,7 @@ static __devinit int vlynq_probe(struct
addr = (u32)ioremap(vdev->mem_start, 0x1000);
if (!addr) {
printk(KERN_ERR "acx: %s: failed to remap io memory\n",
@@ -11,7 +9,7 @@ Index: acx-mac80211-20100302/pci.c
result = -ENXIO;
goto fail;
}
-@@ -4323,7 +4323,7 @@
+@@ -4323,7 +4323,7 @@ static __devinit int vlynq_probe(struct
ieee = ieee80211_alloc_hw(sizeof(struct acx_device), &acxpci_hw_ops);
if (!ieee) {
printk("acx: could not allocate ieee80211 structure %s\n",
@@ -20,7 +18,7 @@ Index: acx-mac80211-20100302/pci.c
goto fail_alloc_netdev;
}
ieee->flags &= ~IEEE80211_HW_RX_INCLUDES_FCS;
-@@ -4365,7 +4365,7 @@
+@@ -4365,7 +4365,7 @@ static __devinit int vlynq_probe(struct
printk("acx: found %s-based wireless network card at %s, irq:%d, "
"phymem:0x%x, mem:0x%p\n",
@@ -29,7 +27,7 @@ Index: acx-mac80211-20100302/pci.c
vdev->mem_start, adev->iobase);
log(L_ANY, "acx: the initial debug setting is 0x%04X\n", acx_debug);
-@@ -4416,7 +4416,7 @@
+@@ -4416,7 +4416,7 @@ static __devinit int vlynq_probe(struct
* firmware operations happening in parallel or uninitialized data */
@@ -38,7 +36,7 @@ Index: acx-mac80211-20100302/pci.c
/* Now we have our device, so make sure the kernel doesn't try
* to send packets even though we're not associated to a network yet */
-@@ -4536,7 +4536,7 @@
+@@ -4536,7 +4536,7 @@ static void vlynq_remove(struct vlynq_de
CLEAR_BIT(adev->dev_state_mask, ACX_STATE_IFACE_UP);
}