summaryrefslogtreecommitdiffstats
path: root/net/ipv4/af_inet.c
diff options
context:
space:
mode:
authorAtis Elsts2009-10-02 00:16:49 +0200
committerDavid S. Miller2009-10-02 00:16:49 +0200
commit914a9ab386a288d0f22252fc268ecbc048cdcbd5 (patch)
tree5bc164381e7ff1b55990288b67ae014b5ed668ea /net/ipv4/af_inet.c
parentsky2: irqname based on pci address (diff)
downloadkernel-qcow2-linux-914a9ab386a288d0f22252fc268ecbc048cdcbd5.tar.gz
kernel-qcow2-linux-914a9ab386a288d0f22252fc268ecbc048cdcbd5.tar.xz
kernel-qcow2-linux-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/af_inet.c')
-rw-r--r--net/ipv4/af_inet.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
index 58c4b0f7c4aa..57737b8d1711 100644
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
@@ -1119,6 +1119,7 @@ int inet_sk_rebuild_header(struct sock *sk)
{
struct flowi fl = {
.oif = sk->sk_bound_dev_if,
+ .mark = sk->sk_mark,
.nl_u = {
.ip4_u = {
.daddr = daddr,