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
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
include
/
linux
/
udp.h
diff --git
a/include/linux/udp.h
b/include/linux/udp.h
index
85a5565
..
90223f0
100644
(file)
--- a/
include/linux/udp.h
+++ b/
include/linux/udp.h
@@
-35,7
+35,6
@@
struct udphdr {
#define UDP_ENCAP_ESPINUDP 2 /* draft-ietf-ipsec-udp-encaps-06 */
#ifdef __KERNEL__
#define UDP_ENCAP_ESPINUDP 2 /* draft-ietf-ipsec-udp-encaps-06 */
#ifdef __KERNEL__
-#include <linux/config.h>
#include <linux/types.h>
#include <net/inet_sock.h>
#include <linux/types.h>
#include <net/inet_sock.h>
@@
-47,7
+46,7
@@
struct udp_sock {
unsigned int corkflag; /* Cork is required */
__u16 encap_type; /* Is this an Encapsulation socket? */
/*
unsigned int corkflag; /* Cork is required */
__u16 encap_type; /* Is this an Encapsulation socket? */
/*
- * Following member retains the infomation to create a UDP header
+ * Following member retains the info
r
mation to create a UDP header
* when the socket is uncorked.
*/
__u16 len; /* total length of pending frames */
* when the socket is uncorked.
*/
__u16 len; /* total length of pending frames */