diff options
| author | Hideaki Yoshifuji <yoshfuji@linux-ipv6.org> | 2003-10-26 07:58:17 -0800 |
|---|---|---|
| committer | David S. Miller <davem@nuts.ninka.net> | 2003-10-26 07:58:17 -0800 |
| commit | b97edd05b13641f6f723db0e90c706d8291e5e6d (patch) | |
| tree | eee299b6c0a7094510ac0b48c128b5ce9930e4e8 /include | |
| parent | e8b06d941d7610627c4173346f126a3e7a3a108f (diff) | |
[IPV4,6]: Use common storage for cork'd flow, needed to handle mapped-ipv4 ipv6 addresses properly.
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/ip.h | 2 | ||||
| -rw-r--r-- | include/linux/ipv6.h | 2 | ||||
| -rw-r--r-- | include/linux/udp.h | 6 |
3 files changed, 3 insertions, 7 deletions
diff --git a/include/linux/ip.h b/include/linux/ip.h index ac117b884331..1adc75a76926 100644 --- a/include/linux/ip.h +++ b/include/linux/ip.h @@ -83,6 +83,7 @@ #include <linux/types.h> #include <net/sock.h> #include <linux/igmp.h> +#include <net/flow.h> struct ip_options { __u32 faddr; /* Saved first hop address */ @@ -141,6 +142,7 @@ struct inet_opt { struct rtable *rt; int length; /* Total length of all frames */ u32 addr; + struct flowi fl; } cork; }; diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h index cabbeb633fde..da2e64899c95 100644 --- a/include/linux/ipv6.h +++ b/include/linux/ipv6.h @@ -174,7 +174,6 @@ enum { #include <net/if_inet6.h> /* struct ipv6_mc_socklist */ #include <linux/tcp.h> #include <linux/udp.h> -#include <net/flow.h> /* This structure contains results of exthdrs parsing @@ -235,7 +234,6 @@ struct ipv6_pinfo { struct { struct ipv6_txoptions *opt; struct rt6_info *rt; - struct flowi fl; int hop_limit; } cork; }; diff --git a/include/linux/udp.h b/include/linux/udp.h index 5269673e007d..492b258c76c8 100644 --- a/include/linux/udp.h +++ b/include/linux/udp.h @@ -44,13 +44,9 @@ struct udp_opt { unsigned int corkflag; /* Cork is required */ __u16 encap_type; /* Is this an Encapsulation socket? */ /* - * Following members retains the infomation to create a UDP header + * Following member retains the infomation to create a UDP header * when the socket is uncorked. */ - u32 saddr; /* source address */ - u32 daddr; /* destination address */ - __u16 sport; /* source port */ - __u16 dport; /* destination port */ __u16 len; /* total length of pending frames */ }; |