projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
[cascardo/linux.git]
/
net
/
ipv4
/
protocol.c
diff --git
a/net/ipv4/protocol.c
b/net/ipv4/protocol.c
index
05f5114
..
ea50da0
100644
(file)
--- a/
net/ipv4/protocol.c
+++ b/
net/ipv4/protocol.c
@@
-5,8
+5,6
@@
*
* INET protocol dispatch tables.
*
*
* INET protocol dispatch tables.
*
- * Version: $Id: protocol.c,v 1.14 2001/05/18 02:25:49 davem Exp $
- *
* Authors: Ross Biro
* Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
*
* Authors: Ross Biro
* Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
*
@@
-30,7
+28,6
@@
#include <linux/module.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/kernel.h>
-#include <linux/sched.h>
#include <linux/string.h>
#include <linux/socket.h>
#include <linux/in.h>
#include <linux/string.h>
#include <linux/socket.h>
#include <linux/in.h>
@@
-46,7
+43,7
@@
#include <net/ipip.h>
#include <linux/igmp.h>
#include <net/ipip.h>
#include <linux/igmp.h>
-struct net_protocol *inet_protos[MAX_INET_PROTOS];
+struct net_protocol *inet_protos[MAX_INET_PROTOS]
____cacheline_aligned_in_smp
;
static DEFINE_SPINLOCK(inet_proto_lock);
/*
static DEFINE_SPINLOCK(inet_proto_lock);
/*
@@
-74,7
+71,7
@@
int inet_add_protocol(struct net_protocol *prot, unsigned char protocol)
/*
* Remove a protocol from the hash tables.
*/
/*
* Remove a protocol from the hash tables.
*/
-
+
int inet_del_protocol(struct net_protocol *prot, unsigned char protocol)
{
int hash, ret;
int inet_del_protocol(struct net_protocol *prot, unsigned char protocol)
{
int hash, ret;