Merge tag 'v3.10.70' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / include / net / ip.h

diff --git a/include/net/ip.h b/include/net/ip.h
index 0a62365149e2b3cf716882deb4aafdd413ac48da..fc62ae0a47d2932393d4ebf98bd2d3c9ffba6356 100644 (file)
--- a/include/net/ip.h
+++ b/include/net/ip.h
@@ -154,6 +154,7 @@ struct ip_reply_arg {
                                /* -1 if not needed */ 
        int         bound_dev_if;
        u8          tos;
+       kuid_t      uid;
 }; 
 
 #define IP_REPLY_ARG_NOSRCCHECK 1
@@ -226,6 +227,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;