projects / GitHub / LineageOS / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 13f09b9)
rt61pci: fix-up merge damage
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 24 Jan 2008 18:08:01 +0000 (13:08 -0500)
committerDavid S. Miller <davem@davemloft.net>
Fri, 1 Feb 2008 03:26:33 +0000 (19:26 -0800)
A subtle merge error was introduced after re-queueing a patch for 2.6.24
instead of 2.6.25...

Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/wireless/rt2x00/rt61pci.c patch | blob | blame | history

diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c
index ab52f221cd718c06411d50c76b06c308be7b4f3b..b31f0c26c32b7bb889ba789a562aeb7ae3f889ba 100644 (file)
--- a/drivers/net/wireless/rt2x00/rt61pci.c
+++ b/drivers/net/wireless/rt2x00/rt61pci.c
@@ -1736,7 +1736,8 @@ static void rt61pci_txdone(struct rt2x00_dev *rt2x00dev)
                        WARNING(rt2x00dev,
                                "TX status report missed for entry %p\n",
                                entry_done);
-                       rt2x00lib_txdone(entry_done, TX_FAIL_OTHER, 0);
+                       rt2x00pci_txdone(rt2x00dev, entry_done, TX_FAIL_OTHER,
+                                        0);
                        entry_done = rt2x00_get_data_entry_done(ring);
                }