Merge branch 'linaro-android-3.10-lsk' of git://android.git.linaro.org/kernel/linaro...

[firefly-linux-kernel-4.4.55.git] / include / net / ip.h

diff --git a/include/net/ip.h b/include/net/ip.h
index a68f838a132c522df397b9398f8f2d64646008c0..02fc145ecc42157c07d6dd6fdc45a280e3efd864 100644 (file)
--- a/include/net/ip.h
+++ b/include/net/ip.h
@@ -153,6 +153,7 @@ struct ip_reply_arg {
                                /* -1 if not needed */ 
        int         bound_dev_if;
        u8          tos;
+       kuid_t      uid;
 }; 
 
 #define IP_REPLY_ARG_NOSRCCHECK 1
@@ -225,6 +226,9 @@ extern void ipfrag_init(void);
 
 extern void ip_static_sysctl_init(void);
 
+#define IP4_REPLY_MARK(net, mark) \
+       ((net)->ipv4.sysctl_fwmark_reflect ? (mark) : 0)
+
 static inline bool ip_is_fragment(const struct iphdr *iph)
 {
        return (iph->frag_off & htons(IP_MF | IP_OFFSET)) != 0;