diff options
| author | John W. Linville <linville@tuxdriver.com> | 2008-01-24 21:08:01 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-02-01 06:26:33 +0300 |
| commit | 4bdb0fba9e53dc263eb9601404d097dd99e60f83 (patch) | |
| tree | fcffdab76710a231579fd927203cb0f50ced7657 /drivers/net | |
| parent | 13f09b95a82c46ed608d057b22e0dd18ebfff22a (diff) | |
| download | linux-4bdb0fba9e53dc263eb9601404d097dd99e60f83.tar.xz | |
rt61pci: fix-up merge damage
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>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt61pci.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c index ab52f221cd71..b31f0c26c32b 100644 --- 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); } |