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
vserver 2.0 rc7
[linux-2.6.git]
/
include
/
linux
/
ip.h
diff --git
a/include/linux/ip.h
b/include/linux/ip.h
index
acba126
..
301e8c6
100644
(file)
--- a/
include/linux/ip.h
+++ b/
include/linux/ip.h
@@
-122,18
+122,18
@@
struct inet_sock {
__u16 dport; /* Destination port */
__u16 num; /* Local port */
__u32 saddr; /* Sending source */
__u16 dport; /* Destination port */
__u16 num; /* Local port */
__u32 saddr; /* Sending source */
- int uc_ttl; /* Unicast TTL */
- int tos; /* TOS */
- unsigned cmsg_flags;
+ __s16 uc_ttl; /* Unicast TTL */
+ __u16 cmsg_flags;
struct ip_options *opt;
__u16 sport; /* Source port */
struct ip_options *opt;
__u16 sport; /* Source port */
- unsigned char hdrincl; /* Include headers ? */
+ __u16 id; /* ID counter for DF pkts */
+ __u8 tos; /* TOS */
__u8 mc_ttl; /* Multicasting TTL */
__u8 mc_ttl; /* Multicasting TTL */
- __u8 mc_loop; /* Loopback */
__u8 pmtudisc;
__u8 pmtudisc;
- __u16 id; /* ID counter for DF pkts */
unsigned recverr : 1,
unsigned recverr : 1,
- freebind : 1;
+ freebind : 1,
+ hdrincl : 1,
+ mc_loop : 1;
int mc_index; /* Multicast device index */
__u32 mc_addr;
struct ip_mc_socklist *mc_list; /* Group array */
int mc_index; /* Multicast device index */
__u32 mc_addr;
struct ip_mc_socklist *mc_list; /* Group array */
@@
-153,6
+153,7
@@
struct inet_sock {
};
#define IPCORK_OPT 1 /* ip-options has been held in ipcork.opt */
};
#define IPCORK_OPT 1 /* ip-options has been held in ipcork.opt */
+#define IPCORK_ALLFRAG 2 /* always fragment (for ipv6 for now) */
static inline struct inet_sock *inet_sk(const struct sock *sk)
{
static inline struct inet_sock *inet_sk(const struct sock *sk)
{
@@
-164,7
+165,7
@@
static inline void __inet_sk_copy_descendant(struct sock *sk_to,
const int ancestor_size)
{
memcpy(inet_sk(sk_to) + 1, inet_sk(sk_from) + 1,
const int ancestor_size)
{
memcpy(inet_sk(sk_to) + 1, inet_sk(sk_from) + 1,
- sk_from->sk_prot->
slab_
obj_size - ancestor_size);
+ sk_from->sk_prot->obj_size - ancestor_size);
}
#if !(defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE))
static inline void inet_sk_copy_descendant(struct sock *sk_to,
}
#if !(defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE))
static inline void inet_sk_copy_descendant(struct sock *sk_to,