git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
net
/
ipv4
/
protocol.c
diff --git
a/net/ipv4/protocol.c
b/net/ipv4/protocol.c
index
a8b4bdc
..
05f5114
100644
(file)
--- a/
net/ipv4/protocol.c
+++ b/
net/ipv4/protocol.c
@@
-7,7
+7,7
@@
*
* Version: $Id: protocol.c,v 1.14 2001/05/18 02:25:49 davem Exp $
*
*
* Version: $Id: protocol.c,v 1.14 2001/05/18 02:25:49 davem Exp $
*
- * Authors: Ross Biro
, <bir7@leland.Stanford.Edu>
+ * Authors: Ross Biro
* Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
*
* Fixes:
* Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
*
* Fixes:
@@
-32,7
+32,6
@@
#include <linux/kernel.h>
#include <linux/sched.h>
#include <linux/string.h>
#include <linux/kernel.h>
#include <linux/sched.h>
#include <linux/string.h>
-#include <linux/config.h>
#include <linux/socket.h>
#include <linux/in.h>
#include <linux/inet.h>
#include <linux/socket.h>
#include <linux/in.h>
#include <linux/inet.h>
@@
-40,7
+39,6
@@
#include <linux/timer.h>
#include <net/ip.h>
#include <net/protocol.h>
#include <linux/timer.h>
#include <net/ip.h>
#include <net/protocol.h>
-#include <net/tcp.h>
#include <linux/skbuff.h>
#include <net/sock.h>
#include <net/icmp.h>
#include <linux/skbuff.h>
#include <net/sock.h>
#include <net/icmp.h>
@@
-49,7
+47,7
@@
#include <linux/igmp.h>
struct net_protocol *inet_protos[MAX_INET_PROTOS];
#include <linux/igmp.h>
struct net_protocol *inet_protos[MAX_INET_PROTOS];
-static
spinlock_t inet_proto_lock = SPIN_LOCK_UNLOCKED
;
+static
DEFINE_SPINLOCK(inet_proto_lock)
;
/*
* Add a protocol handler to the hash tables
/*
* Add a protocol handler to the hash tables