3.16.49-rc1 review patch. If anyone has any objections, please let me know.
------------------ From: Jamal Hadi Salim <[email protected]> commit e05a90ec9e1680952454ea9510da9a761a5baac9 upstream. SYN-ACK responses on a server in response to a SYN from a client did not get the injected skb mark that was tagged on the SYN packet. Fixes: 84f39b08d786 ("net: support marking accepting TCP sockets") Reviewed-by: Lorenzo Colitti <[email protected]> Signed-off-by: Jamal Hadi Salim <[email protected]> Signed-off-by: David S. Miller <[email protected]> Signed-off-by: Ben Hutchings <[email protected]> --- net/ipv4/ip_output.c | 3 ++- net/ipv4/tcp_output.c | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) --- a/net/ipv4/ip_output.c +++ b/net/ipv4/ip_output.c @@ -158,7 +158,8 @@ int ip_build_and_send_pkt(struct sk_buff } skb->priority = sk->sk_priority; - skb->mark = sk->sk_mark; + if (!skb->mark) + skb->mark = sk->sk_mark; /* Send it out. */ return ip_local_out(skb); --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -2863,6 +2863,7 @@ struct sk_buff *tcp_make_synack(struct s TCP_ECN_make_synack(req, th); th->source = htons(ireq->ir_num); th->dest = ireq->ir_rmt_port; + skb->mark = ireq->ir_mark; /* Setting of flags are superfluous here for callers (and ECE is * not even correctly set) */
