diff options
| author | Patrick McHardy <kaber@trash.net> | 2006-01-06 23:04:01 -0800 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-01-07 12:57:32 -0800 |
| commit | 8cdfab8a43bb4b3da686ea503a702cb6f9f6a803 (patch) | |
| tree | 9c4f42ff23f0e227e705aa5aae4f74e45297f3cb /include/net | |
| parent | b05e106698d9966de524e78d9da1bf6407fe0c32 (diff) | |
| download | op-kernel-dev-8cdfab8a43bb4b3da686ea503a702cb6f9f6a803.zip op-kernel-dev-8cdfab8a43bb4b3da686ea503a702cb6f9f6a803.tar.gz | |
[IPV4]: reset IPCB flags when neccessary
Reset IPSKB_XFRM_TUNNEL_SIZE flags in ipip and ip_gre hard_start_xmit
function before the packet reenters IP. This is neccessary so the
encapsulated packets are checked not to be oversized in xfrm4_output.c
again. Reset all flags in sit when a packet changes its address family.
Also remove some obsolete IPSKB flags.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/ip.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/include/net/ip.h b/include/net/ip.h index 7bb5804..52f4d9c 100644 --- a/include/net/ip.h +++ b/include/net/ip.h @@ -37,11 +37,9 @@ struct inet_skb_parm struct ip_options opt; /* Compiled IP options */ unsigned char flags; -#define IPSKB_MASQUERADED 1 -#define IPSKB_TRANSLATED 2 -#define IPSKB_FORWARDED 4 -#define IPSKB_XFRM_TUNNEL_SIZE 8 -#define IPSKB_FRAG_COMPLETE 16 +#define IPSKB_FORWARDED 1 +#define IPSKB_XFRM_TUNNEL_SIZE 2 +#define IPSKB_FRAG_COMPLETE 4 }; struct ipcm_cookie |
