Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (235 commits)
  [NETFILTER]: Add H.323 conntrack/NAT helper
  [TG3]: Don't mark tg3_test_registers() as returning const.
  [IPV6]: Cleanups for net/ipv6/addrconf.c (kzalloc, early exit) v2
  [IPV6]: Nearly complete kzalloc cleanup for net/ipv6
  [IPV6]: Cleanup of net/ipv6/reassambly.c
  [BRIDGE]: Remove duplicate const from is_link_local() argument type.
  [DECNET]: net/decnet/dn_route.c: fix inconsequent NULL checking
  [TG3]: make drivers/net/tg3.c:tg3_request_irq() static
  [BRIDGE]: use LLC to send STP
  [LLC]: llc_mac_hdr_init const arguments
  [BRIDGE]: allow show/store of group multicast address
  [BRIDGE]: use llc for receiving STP packets
  [BRIDGE]: stp timer to jiffies cleanup
  [BRIDGE]: forwarding remove unneeded preempt and bh diasables
  [BRIDGE]: netfilter inline cleanup
  [BRIDGE]: netfilter VLAN macro cleanup
  [BRIDGE]: netfilter dont use __constant_htons
  [BRIDGE]: netfilter whitespace
  [BRIDGE]: optimize frame pass up
  [BRIDGE]: use kzalloc
  ...

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)
         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();
 }
 
 /*