aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/ip_output.c
diff options
context:
space:
mode:
authorAtis Elsts <atis@mikrotik.com>2009-10-01 15:16:49 -0700
committerDavid S. Miller <davem@davemloft.net>2009-10-01 15:16:49 -0700
commit914a9ab386a288d0f22252fc268ecbc048cdcbd5 (patch)
tree5bc164381e7ff1b55990288b67ae014b5ed668ea /net/ipv4/ip_output.c
parentsky2: irqname based on pci address (diff)
downloadlinux-dev-914a9ab386a288d0f22252fc268ecbc048cdcbd5.tar.xz
linux-dev-914a9ab386a288d0f22252fc268ecbc048cdcbd5.zip
net: Use sk_mark for routing lookup in more places
This patch against v2.6.31 adds support for route lookup using sk_mark in some more places. The benefits from this patch are the following. First, SO_MARK option now has effect on UDP sockets too. Second, ip_queue_xmit() and inet_sk_rebuild_header() could fail to do routing lookup correctly if TCP sockets with SO_MARK were used. Signed-off-by: Atis Elsts <atis@mikrotik.com> Acked-by: Eric Dumazet <eric.dumazet@gmail.com>
Diffstat (limited to 'net/ipv4/ip_output.c')
-rw-r--r--net/ipv4/ip_output.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index 9fe5d7b81580..f9895180f481 100644
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -335,6 +335,7 @@ int ip_queue_xmit(struct sk_buff *skb, int ipfragok)
{
struct flowi fl = { .oif = sk->sk_bound_dev_if,
+ .mark = sk->sk_mark,
.nl_u = { .ip4_u =
{ .daddr = daddr,
.saddr = inet->saddr,