From e4989c5fb2d7306a766c21f26cc3fc3e0c7bce54 Mon Sep 17 00:00:00 2001 From: Atis Elsts Date: Wed, 7 Oct 2009 13:55:57 -0700 Subject: [PATCH] --- yaml --- r: 170472 b: refs/heads/master c: ffce908246c93b17304c313886d25cfa8aecd1d7 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/ipv4/inet_connection_sock.c | 1 + trunk/net/ipv4/syncookies.c | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f0ed966e5594..7df9ac5e68ca 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 996ccf49005662ee7fee38a45be5cb27bf370b1d +refs/heads/master: ffce908246c93b17304c313886d25cfa8aecd1d7 diff --git a/trunk/net/ipv4/inet_connection_sock.c b/trunk/net/ipv4/inet_connection_sock.c index 4351ca2cf0b8..9139e8f6fdb1 100644 --- a/trunk/net/ipv4/inet_connection_sock.c +++ b/trunk/net/ipv4/inet_connection_sock.c @@ -358,6 +358,7 @@ struct dst_entry *inet_csk_route_req(struct sock *sk, const struct inet_request_sock *ireq = inet_rsk(req); struct ip_options *opt = inet_rsk(req)->opt; struct flowi fl = { .oif = sk->sk_bound_dev_if, + .mark = sk->sk_mark, .nl_u = { .ip4_u = { .daddr = ((opt && opt->srr) ? opt->faddr : diff --git a/trunk/net/ipv4/syncookies.c b/trunk/net/ipv4/syncookies.c index a6e0e077ac33..5ec678ad70ef 100644 --- a/trunk/net/ipv4/syncookies.c +++ b/trunk/net/ipv4/syncookies.c @@ -333,7 +333,8 @@ struct sock *cookie_v4_check(struct sock *sk, struct sk_buff *skb, * no easy way to do this. */ { - struct flowi fl = { .nl_u = { .ip4_u = + struct flowi fl = { .mark = sk->sk_mark, + .nl_u = { .ip4_u = { .daddr = ((opt && opt->srr) ? opt->faddr : ireq->rmt_addr),