提交 4bdb0fba 编写于 作者: J John W. Linville 提交者: David S. Miller

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: NJohn W. Linville <linville@tuxdriver.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 13f09b95
...@@ -1736,7 +1736,8 @@ static void rt61pci_txdone(struct rt2x00_dev *rt2x00dev) ...@@ -1736,7 +1736,8 @@ static void rt61pci_txdone(struct rt2x00_dev *rt2x00dev)
WARNING(rt2x00dev, WARNING(rt2x00dev,
"TX status report missed for entry %p\n", "TX status report missed for entry %p\n",
entry_done); 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); entry_done = rt2x00_get_data_entry_done(ring);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册