diff options
| author | Linus Torvalds <torvalds@penguin.transmeta.com> | 2002-03-11 21:25:49 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@penguin.transmeta.com> | 2002-03-11 21:25:49 -0800 |
| commit | d9f2d50eabbb92ceef65221933651fcfb728c800 (patch) | |
| tree | 6a72c96d24cbf025be8a1be2c9f3fbbccff476cd /include/linux/ip.h | |
| parent | 0602954430012c56ed351ca92fbd52da4db8dd84 (diff) | |
| parent | 04c1e5a1457257b3325e0510cebedebb9b054a19 (diff) | |
Merge master.kernel.org:/home/davem/BK/net-2.5
into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux
Diffstat (limited to 'include/linux/ip.h')
| -rw-r--r-- | include/linux/ip.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/include/linux/ip.h b/include/linux/ip.h index 97e388ade261..3ba8e804b0d8 100644 --- a/include/linux/ip.h +++ b/include/linux/ip.h @@ -116,17 +116,24 @@ struct ip_options { #define optlength(opt) (sizeof(struct ip_options) + opt->optlen) struct inet_opt { + /* Socket demultiplex comparisons on incoming packets. */ + __u32 daddr; /* Foreign IPv4 addr */ + __u32 rcv_saddr; /* Bound local IPv4 addr */ + __u16 dport; /* Destination port */ + __u16 num; /* Local port */ + __u32 saddr; /* Sending source */ int ttl; /* TTL setting */ int tos; /* TOS */ unsigned cmsg_flags; struct ip_options *opt; + __u16 sport; /* Source port */ unsigned char hdrincl; /* Include headers ? */ __u8 mc_ttl; /* Multicasting TTL */ __u8 mc_loop; /* Loopback */ + __u8 pmtudisc; + __u16 id; /* ID counter for DF pkts */ unsigned recverr : 1, freebind : 1; - __u16 id; /* ID counter for DF pkts */ - __u8 pmtudisc; int mc_index; /* Multicast device index */ __u32 mc_addr; struct ip_mc_socklist *mc_list; /* Group array */ |