projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull bugzilla-7887 into release branch
[powerpc.git]
/
net
/
ipv4
/
protocol.c
diff --git
a/net/ipv4/protocol.c
b/net/ipv4/protocol.c
index
0db405a
..
da70fef
100644
(file)
--- a/
net/ipv4/protocol.c
+++ b/
net/ipv4/protocol.c
@@
-30,9
+30,7
@@
#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/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
+38,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>
@@
-76,7
+73,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;