Commit f28e40db authored by David S. Miller's avatar David S. Miller

[NET]: Missing __KERNEL__ ifdefs in linux/{tcp,udp}.h

parent 00ee3e38
...@@ -17,11 +17,8 @@ ...@@ -17,11 +17,8 @@
#ifndef _LINUX_TCP_H #ifndef _LINUX_TCP_H
#define _LINUX_TCP_H #define _LINUX_TCP_H
#include <linux/config.h> #include <linux/types.h>
#include <linux/skbuff.h>
#include <asm/byteorder.h> #include <asm/byteorder.h>
#include <net/sock.h>
#include <linux/ip.h>
struct tcphdr { struct tcphdr {
__u16 source; __u16 source;
...@@ -188,6 +185,13 @@ struct tcp_info ...@@ -188,6 +185,13 @@ struct tcp_info
__u32 tcpi_reordering; __u32 tcpi_reordering;
}; };
#ifdef __KERNEL__
#include <linux/config.h>
#include <linux/skbuff.h>
#include <linux/ip.h>
#include <net/sock.h>
/* This defines a selective acknowledgement block. */ /* This defines a selective acknowledgement block. */
struct tcp_sack_block { struct tcp_sack_block {
__u32 start_seq; __u32 start_seq;
...@@ -384,4 +388,6 @@ struct tcp_sock { ...@@ -384,4 +388,6 @@ struct tcp_sock {
#define tcp_sk(__sk) (&((struct tcp_sock *)__sk)->tcp) #define tcp_sk(__sk) (&((struct tcp_sock *)__sk)->tcp)
#endif
#endif /* _LINUX_TCP_H */ #endif /* _LINUX_TCP_H */
...@@ -17,10 +17,7 @@ ...@@ -17,10 +17,7 @@
#ifndef _LINUX_UDP_H #ifndef _LINUX_UDP_H
#define _LINUX_UDP_H #define _LINUX_UDP_H
#include <linux/config.h> #include <linux/types.h>
#include <asm/byteorder.h>
#include <net/sock.h>
#include <linux/ip.h>
struct udphdr { struct udphdr {
__u16 source; __u16 source;
...@@ -36,6 +33,12 @@ struct udphdr { ...@@ -36,6 +33,12 @@ struct udphdr {
/* UDP encapsulation types */ /* UDP encapsulation types */
#define UDP_ENCAP_ESPINUDP 2 /* draft-ietf-ipsec-udp-encaps-06 */ #define UDP_ENCAP_ESPINUDP 2 /* draft-ietf-ipsec-udp-encaps-06 */
#ifdef __KERNEL__
#include <linux/config.h>
#include <net/sock.h>
#include <linux/ip.h>
struct udp_opt { struct udp_opt {
int pending; /* Any pending frames ? */ int pending; /* Any pending frames ? */
unsigned int corkflag; /* Cork is required */ unsigned int corkflag; /* Cork is required */
...@@ -63,4 +66,6 @@ struct udp_sock { ...@@ -63,4 +66,6 @@ struct udp_sock {
#define udp_sk(__sk) (&((struct udp_sock *)__sk)->udp) #define udp_sk(__sk) (&((struct udp_sock *)__sk)->udp)
#endif
#endif /* _LINUX_UDP_H */ #endif /* _LINUX_UDP_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment