diff options
| author | David S. Miller <davem@davemloft.net> | 2008-11-28 02:19:15 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-28 02:19:15 -0800 |
| commit | ed77a89c30fa03dcb234a84ddea710b3fb7b62da (patch) | |
| tree | 69f3e2c2bbf2fdd4f742e891441f01307d1d1f49 /net/ipv4/netfilter.c | |
| parent | 475ad8e2172d7f8b73af5532a8dad265b51339c2 (diff) | |
| parent | d6e8cc6cc7ac77b0f9118f78c453a2e834e62709 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
Conflicts:
net/netfilter/nf_conntrack_netlink.c
Diffstat (limited to 'net/ipv4/netfilter.c')
| -rw-r--r-- | net/ipv4/netfilter.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/ipv4/netfilter.c b/net/ipv4/netfilter.c index c99eecf89da5..fdf6811c31a2 100644 --- a/net/ipv4/netfilter.c +++ b/net/ipv4/netfilter.c @@ -125,6 +125,7 @@ struct ip_rt_info { __be32 daddr; __be32 saddr; u_int8_t tos; + u_int32_t mark; }; static void nf_ip_saveroute(const struct sk_buff *skb, @@ -138,6 +139,7 @@ static void nf_ip_saveroute(const struct sk_buff *skb, rt_info->tos = iph->tos; rt_info->daddr = iph->daddr; rt_info->saddr = iph->saddr; + rt_info->mark = skb->mark; } } @@ -150,6 +152,7 @@ static int nf_ip_reroute(struct sk_buff *skb, const struct iphdr *iph = ip_hdr(skb); if (!(iph->tos == rt_info->tos + && skb->mark == rt_info->mark && iph->daddr == rt_info->daddr && iph->saddr == rt_info->saddr)) return ip_route_me_harder(skb, RTN_UNSPEC); |