]> git.baikalelectronics.ru Git - kernel.git/commit
rt2x00dev.c: fix-up merge damage
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 10 Jun 2008 13:06:52 +0000 (09:06 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 10 Jun 2008 13:06:52 +0000 (09:06 -0400)
commitd74937406414a0de411dc8fa182046f5c286a2d6
tree89333c407873b5d0a6a6849a94294e952a866bb7
parent52311da1cb2f51add2a102b3f27d6a3b9d738e53
rt2x00dev.c: fix-up merge damage

This restores the effects of "rt2x00: Don't count retries as failure".

Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/rt2x00/rt2x00dev.c