diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-11-23 02:00:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-11-23 02:00:47 +0000 |
| commit | 06615f62b17d7de6e12d2f5ec6b88cf30af08413 (patch) | |
| tree | 8766f208847d4876a6db619aebbf54d53b76eb44 /net/ipv4/ipip.c | |
| parent | fa9bdb574f4febb751848a685d9a9017e04e1d53 (diff) | |
Merge with Linux 2.4.0-test10.
Diffstat (limited to 'net/ipv4/ipip.c')
| -rw-r--r-- | net/ipv4/ipip.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c index eae29c0b0..a8cb239a8 100644 --- a/net/ipv4/ipip.c +++ b/net/ipv4/ipip.c @@ -1,7 +1,7 @@ /* * Linux NET3: IP/IP protocol decoder. * - * Version: $Id: ipip.c,v 1.39 2000/08/25 02:15:47 davem Exp $ + * Version: $Id: ipip.c,v 1.40 2000/10/28 17:19:25 davem Exp $ * * Authors: * Sam Lantinga (slouken@cs.ucdavis.edu) 02/01/95 @@ -894,7 +894,9 @@ int __init ipip_init(void) #ifdef MODULE register_netdev(&ipip_fb_tunnel_dev); #else + rtnl_lock(); register_netdevice(&ipip_fb_tunnel_dev); + rtnl_unlock(); #endif inet_add_protocol(&ipip_protocol); |