diff options
author | Stephen Hemminger <shemminger@osdl.org> | 2006-03-20 22:23:58 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2006-03-20 22:23:58 -0800 |
commit | 6756ae4b4e97aba48c042b4aa6b77a18f507d2cb (patch) | |
tree | 05bf37711d782fb0089d474716026c44a454f89b /drivers/net | |
parent | 253aa11578c1b89757282430891bb66ae5300092 (diff) | |
download | op-kernel-dev-6756ae4b4e97aba48c042b4aa6b77a18f507d2cb.zip op-kernel-dev-6756ae4b4e97aba48c042b4aa6b77a18f507d2cb.tar.gz |
[NET]: Convert RTNL to mutex.
This patch turns the RTNL from a semaphore to a new 2.6.16 mutex and
gets rid of some of the leftover legacy.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/8139too.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/8139too.c b/drivers/net/8139too.c index e58d4c50..f5ee064 100644 --- a/drivers/net/8139too.c +++ b/drivers/net/8139too.c @@ -1605,7 +1605,7 @@ static void rtl8139_thread (void *_data) if (tp->watchdog_fired) { tp->watchdog_fired = 0; rtl8139_tx_timeout_task(_data); - } else if (rtnl_shlock_nowait() == 0) { + } else if (rtnl_trylock()) { rtl8139_thread_iter (dev, tp, tp->mmio_addr); rtnl_unlock (); } else { |