diff options
author | Alexey Dobriyan <adobriyan@gmail.com> | 2009-09-09 06:43:50 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-09-09 06:43:50 -0400 |
commit | fa1a9c681377c57e233038e50479e7d7a5cc3108 (patch) | |
tree | 719cfaa29913c352e55efcfc35a7de84c839a3f6 /net | |
parent | 5d5d9c97ff807b643b6c2284dea7fe04ecc74355 (diff) |
headers: net/ipv[46]/protocol.c header trim
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r-- | net/ipv4/protocol.c | 19 | ||||
-rw-r--r-- | net/ipv6/protocol.c | 15 |
2 files changed, 4 insertions, 30 deletions
diff --git a/net/ipv4/protocol.c b/net/ipv4/protocol.c index ea50da0649fd..a2e5fc0a15e1 100644 --- a/net/ipv4/protocol.c +++ b/net/ipv4/protocol.c | |||
@@ -22,26 +22,11 @@ | |||
22 | * as published by the Free Software Foundation; either version | 22 | * as published by the Free Software Foundation; either version |
23 | * 2 of the License, or (at your option) any later version. | 23 | * 2 of the License, or (at your option) any later version. |
24 | */ | 24 | */ |
25 | 25 | #include <linux/cache.h> | |
26 | #include <asm/uaccess.h> | ||
27 | #include <asm/system.h> | ||
28 | #include <linux/module.h> | 26 | #include <linux/module.h> |
29 | #include <linux/types.h> | ||
30 | #include <linux/kernel.h> | ||
31 | #include <linux/string.h> | ||
32 | #include <linux/socket.h> | ||
33 | #include <linux/in.h> | ||
34 | #include <linux/inet.h> | ||
35 | #include <linux/netdevice.h> | 27 | #include <linux/netdevice.h> |
36 | #include <linux/timer.h> | 28 | #include <linux/spinlock.h> |
37 | #include <net/ip.h> | ||
38 | #include <net/protocol.h> | 29 | #include <net/protocol.h> |
39 | #include <linux/skbuff.h> | ||
40 | #include <net/sock.h> | ||
41 | #include <net/icmp.h> | ||
42 | #include <net/udp.h> | ||
43 | #include <net/ipip.h> | ||
44 | #include <linux/igmp.h> | ||
45 | 30 | ||
46 | struct net_protocol *inet_protos[MAX_INET_PROTOS] ____cacheline_aligned_in_smp; | 31 | struct net_protocol *inet_protos[MAX_INET_PROTOS] ____cacheline_aligned_in_smp; |
47 | static DEFINE_SPINLOCK(inet_proto_lock); | 32 | static DEFINE_SPINLOCK(inet_proto_lock); |
diff --git a/net/ipv6/protocol.c b/net/ipv6/protocol.c index 9ab789159913..568864f722ca 100644 --- a/net/ipv6/protocol.c +++ b/net/ipv6/protocol.c | |||
@@ -20,20 +20,9 @@ | |||
20 | * - Removed unused variable 'inet6_protocol_base' | 20 | * - Removed unused variable 'inet6_protocol_base' |
21 | * - Modified inet6_del_protocol() to correctly maintain copy bit. | 21 | * - Modified inet6_del_protocol() to correctly maintain copy bit. |
22 | */ | 22 | */ |
23 | 23 | #include <linux/module.h> | |
24 | #include <linux/errno.h> | ||
25 | #include <linux/types.h> | ||
26 | #include <linux/socket.h> | ||
27 | #include <linux/sockios.h> | ||
28 | #include <linux/net.h> | ||
29 | #include <linux/in6.h> | ||
30 | #include <linux/netdevice.h> | 24 | #include <linux/netdevice.h> |
31 | #include <linux/if_arp.h> | 25 | #include <linux/spinlock.h> |
32 | |||
33 | #include <net/sock.h> | ||
34 | #include <net/snmp.h> | ||
35 | |||
36 | #include <net/ipv6.h> | ||
37 | #include <net/protocol.h> | 26 | #include <net/protocol.h> |
38 | 27 | ||
39 | struct inet6_protocol *inet6_protos[MAX_INET_PROTOS]; | 28 | struct inet6_protocol *inet6_protos[MAX_INET_PROTOS]; |