diff options
author | Stephen Hemminger <shemminger@osdl.org> | 2006-03-21 01:23:58 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2006-03-21 01:23:58 -0500 |
commit | 6756ae4b4e97aba48c042b4aa6b77a18f507d2cb (patch) | |
tree | 05bf37711d782fb0089d474716026c44a454f89b /net/ipv4/ipconfig.c | |
parent | 253aa11578c1b89757282430891bb66ae5300092 (diff) |
[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 'net/ipv4/ipconfig.c')
-rw-r--r-- | net/ipv4/ipconfig.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c index bb3613ec448c..cb8a92f18ef6 100644 --- a/net/ipv4/ipconfig.c +++ b/net/ipv4/ipconfig.c | |||
@@ -186,7 +186,7 @@ static int __init ic_open_devs(void) | |||
186 | unsigned short oflags; | 186 | unsigned short oflags; |
187 | 187 | ||
188 | last = &ic_first_dev; | 188 | last = &ic_first_dev; |
189 | rtnl_shlock(); | 189 | rtnl_lock(); |
190 | 190 | ||
191 | /* bring loopback device up first */ | 191 | /* bring loopback device up first */ |
192 | if (dev_change_flags(&loopback_dev, loopback_dev.flags | IFF_UP) < 0) | 192 | if (dev_change_flags(&loopback_dev, loopback_dev.flags | IFF_UP) < 0) |
@@ -215,7 +215,7 @@ static int __init ic_open_devs(void) | |||
215 | continue; | 215 | continue; |
216 | } | 216 | } |
217 | if (!(d = kmalloc(sizeof(struct ic_device), GFP_KERNEL))) { | 217 | if (!(d = kmalloc(sizeof(struct ic_device), GFP_KERNEL))) { |
218 | rtnl_shunlock(); | 218 | rtnl_unlock(); |
219 | return -1; | 219 | return -1; |
220 | } | 220 | } |
221 | d->dev = dev; | 221 | d->dev = dev; |
@@ -232,7 +232,7 @@ static int __init ic_open_devs(void) | |||
232 | dev->name, able, d->xid)); | 232 | dev->name, able, d->xid)); |
233 | } | 233 | } |
234 | } | 234 | } |
235 | rtnl_shunlock(); | 235 | rtnl_unlock(); |
236 | 236 | ||
237 | *last = NULL; | 237 | *last = NULL; |
238 | 238 | ||
@@ -251,7 +251,7 @@ static void __init ic_close_devs(void) | |||
251 | struct ic_device *d, *next; | 251 | struct ic_device *d, *next; |
252 | struct net_device *dev; | 252 | struct net_device *dev; |
253 | 253 | ||
254 | rtnl_shlock(); | 254 | rtnl_lock(); |
255 | next = ic_first_dev; | 255 | next = ic_first_dev; |
256 | while ((d = next)) { | 256 | while ((d = next)) { |
257 | next = d->next; | 257 | next = d->next; |
@@ -262,7 +262,7 @@ static void __init ic_close_devs(void) | |||
262 | } | 262 | } |
263 | kfree(d); | 263 | kfree(d); |
264 | } | 264 | } |
265 | rtnl_shunlock(); | 265 | rtnl_unlock(); |
266 | } | 266 | } |
267 | 267 | ||
268 | /* | 268 | /* |