diff options
| author | Andres Salomon <dilinger@debian.org> | 2008-05-07 18:11:01 -0400 |
|---|---|---|
| committer | Andres Salomon <dilinger@debian.org> | 2008-05-07 18:11:01 -0400 |
| commit | 369d9dd17683faa8be41be581db141e80eae05ce (patch) | |
| tree | 5ae43f12136321301b159efc7a113264bb8e285c /include/linux | |
| parent | 231c7b715f4a8d054eac0cc1fc09fb9e1a23c7c2 (diff) | |
| parent | 4d25341bc72d15458570067e1a118d200d117cb8 (diff) | |
| download | lwn-369d9dd17683faa8be41be581db141e80eae05ce.tar.gz lwn-369d9dd17683faa8be41be581db141e80eae05ce.zip | |
Merge branch '2.6.25.y' into testing
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/rtnetlink.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h index b9e174079002..44c81c744538 100644 --- a/include/linux/rtnetlink.h +++ b/include/linux/rtnetlink.h @@ -740,13 +740,13 @@ extern void rtmsg_ifinfo(int type, struct net_device *dev, unsigned change); extern void rtnl_lock(void); extern void rtnl_unlock(void); extern int rtnl_trylock(void); +extern int rtnl_is_locked(void); extern void rtnetlink_init(void); extern void __rtnl_unlock(void); #define ASSERT_RTNL() do { \ - if (unlikely(rtnl_trylock())) { \ - rtnl_unlock(); \ + if (unlikely(!rtnl_is_locked())) { \ printk(KERN_ERR "RTNL: assertion failed at %s (%d)\n", \ __FILE__, __LINE__); \ dump_stack(); \ |