X-Git-Url: https://git.stricted.de/?a=blobdiff_plain;f=include%2Fnet%2Finet_sock.h;h=9528e10fa0b491f6b65c00e4b9ca88483b73e8b2;hb=HEAD;hp=7235ae73a1e8d07a905d6803017d341d951e8f56;hpb=7f585bbfc54fec9dcf387fd2edb2d6f4908badf8;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

diff --git a/include/net/inet_sock.h b/include/net/inet_sock.h
index 7235ae73a1e8..9528e10fa0b4 100644
--- a/include/net/inet_sock.h
+++ b/include/net/inet_sock.h
@@ -88,6 +88,7 @@ struct inet_request_sock {
 				acked	   : 1,
 				no_srccheck: 1;
 	kmemcheck_bitfield_end(flags);
+	u32                     ir_mark;
 	struct ip_options_rcu	*opt;
 };
 
@@ -96,6 +97,14 @@ static inline struct inet_request_sock *inet_rsk(const struct request_sock *sk)
 	return (struct inet_request_sock *)sk;
 }
 
+static inline u32 inet_request_mark(struct sock *sk, struct sk_buff *skb)
+{
+	if (!sk->sk_mark && sock_net(sk)->ipv4.sysctl_tcp_fwmark_accept)
+		return skb->mark;
+
+	return sk->sk_mark;
+}
+
 struct inet_cork {
 	unsigned int		flags;
 	__be32			addr;