[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>

2 files changed, 17 insertions, 17 deletions

diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c
index 64ce52bf0485..3ec502f19da0 100644
--- a/net/ipv4/igmp.c
+++ b/net/ipv4/igmp.c
@@ -1730,7 +1730,7 @@ int ip_mc_join_group(struct sock *sk , struct ip_mreqn *imr)
         if (!MULTICAST(addr))
                 return -EINVAL;
 
-        rtnl_shlock();
+        rtnl_lock();
 
         in_dev = ip_mc_find_dev(imr);
 
@@ -1763,7 +1763,7 @@ int ip_mc_join_group(struct sock *sk , struct ip_mreqn *imr)
         ip_mc_inc_group(in_dev, addr);
         err = 0;
 done:
-        rtnl_shunlock();
+        rtnl_unlock();
         return err;
 }
 
@@ -1837,7 +1837,7 @@ int ip_mc_source(int add, int omode, struct sock *sk, struct
         if (!MULTICAST(addr))
                 return -EINVAL;
 
-        rtnl_shlock();
+        rtnl_lock();
 
         imr.imr_multiaddr.s_addr = mreqs->imr_multiaddr;
         imr.imr_address.s_addr = mreqs->imr_interface;
@@ -1947,7 +1947,7 @@ int ip_mc_source(int add, int omode, struct sock *sk, struct
         ip_mc_add_src(in_dev, &mreqs->imr_multiaddr, omode, 1, 
                 &mreqs->imr_sourceaddr, 1);
 done:
-        rtnl_shunlock();
+        rtnl_unlock();
         if (leavegroup)
                 return ip_mc_leave_group(sk, &imr);
         return err;
@@ -1970,7 +1970,7 @@ int ip_mc_msfilter(struct sock *sk, struct ip_msfilter *msf, int ifindex)
             msf->imsf_fmode != MCAST_EXCLUDE)
                 return -EINVAL;
 
-        rtnl_shlock();
+        rtnl_lock();
 
         imr.imr_multiaddr.s_addr = msf->imsf_multiaddr;
         imr.imr_address.s_addr = msf->imsf_interface;
@@ -2030,7 +2030,7 @@ int ip_mc_msfilter(struct sock *sk, struct ip_msfilter *msf, int ifindex)
         pmc->sfmode = msf->imsf_fmode;
         err = 0;
 done:
-        rtnl_shunlock();
+        rtnl_unlock();
         if (leavegroup)
                 err = ip_mc_leave_group(sk, &imr);
         return err;
@@ -2050,7 +2050,7 @@ int ip_mc_msfget(struct sock *sk, struct ip_msfilter *msf,
         if (!MULTICAST(addr))
                 return -EINVAL;
 
-        rtnl_shlock();
+        rtnl_lock();
 
         imr.imr_multiaddr.s_addr = msf->imsf_multiaddr;
         imr.imr_address.s_addr = msf->imsf_interface;
@@ -2072,7 +2072,7 @@ int ip_mc_msfget(struct sock *sk, struct ip_msfilter *msf,
                 goto done;
         msf->imsf_fmode = pmc->sfmode;
         psl = pmc->sflist;
-        rtnl_shunlock();
+        rtnl_unlock();
         if (!psl) {
                 len = 0;
                 count = 0;
@@ -2091,7 +2091,7 @@ int ip_mc_msfget(struct sock *sk, struct ip_msfilter *msf,
                 return -EFAULT;
         return 0;
 done:
-        rtnl_shunlock();
+        rtnl_unlock();
         return err;
 }
 
@@ -2112,7 +2112,7 @@ int ip_mc_gsfget(struct sock *sk, struct group_filter *gsf,
         if (!MULTICAST(addr))
                 return -EINVAL;
 
-        rtnl_shlock();
+        rtnl_lock();
 
         err = -EADDRNOTAVAIL;
 
@@ -2125,7 +2125,7 @@ int ip_mc_gsfget(struct sock *sk, struct group_filter *gsf,
                 goto done;
         gsf->gf_fmode = pmc->sfmode;
         psl = pmc->sflist;
-        rtnl_shunlock();
+        rtnl_unlock();
         count = psl ? psl->sl_count : 0;
         copycount = count < gsf->gf_numsrc ? count : gsf->gf_numsrc;
         gsf->gf_numsrc = count;
@@ -2146,7 +2146,7 @@ int ip_mc_gsfget(struct sock *sk, struct group_filter *gsf,
         }
         return 0;
 done:
-        rtnl_shunlock();
+        rtnl_unlock();
         return err;
 }
 
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)
         unsigned short oflags;
 
         last = &ic_first_dev;
-        rtnl_shlock();
+        rtnl_lock();
 
         /* bring loopback device up first */
         if (dev_change_flags(&loopback_dev, loopback_dev.flags | IFF_UP) < 0)
@@ -215,7 +215,7 @@ static int __init ic_open_devs(void)
                                 continue;
                         }
                         if (!(d = kmalloc(sizeof(struct ic_device), GFP_KERNEL))) {
-                                rtnl_shunlock();
+                                rtnl_unlock();
                                 return -1;
                         }
                         d->dev = dev;
@@ -232,7 +232,7 @@ static int __init ic_open_devs(void)
                                 dev->name, able, d->xid));
                 }
         }
-        rtnl_shunlock();
+        rtnl_unlock();
 
         *last = NULL;
 
@@ -251,7 +251,7 @@ static void __init ic_close_devs(void)
         struct ic_device *d, *next;
         struct net_device *dev;
 
-        rtnl_shlock();
+        rtnl_lock();
         next = ic_first_dev;
         while ((d = next)) {
                 next = d->next;
@@ -262,7 +262,7 @@ static void __init ic_close_devs(void)
                 }
                 kfree(d);
         }
-        rtnl_shunlock();
+        rtnl_unlock();
 }
 
 /*