aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Stultz <john.stultz@linaro.org>2016-08-02 11:27:48 -0700
committerJohn Stultz <john.stultz@linaro.org>2017-01-26 10:54:44 -0800
commit8afdaa6d2d95f0994863346f0d21a152260b59ab (patch)
tree8c3e581e5137bf9d8e07f0a671dc1cc421deff02
parentd80e6d82288fcb818e835b04c008ac4cf6337285 (diff)
HACK: ANDROID: net: fib_rules fixup for android userspace.
Signed-off-by: John Stultz <john.stultz@linaro.org>
-rw-r--r--include/uapi/linux/fib_rules.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/include/uapi/linux/fib_rules.h b/include/uapi/linux/fib_rules.h
index bbf02a63a011..7b009acacf43 100644
--- a/include/uapi/linux/fib_rules.h
+++ b/include/uapi/linux/fib_rules.h
@@ -54,6 +54,14 @@ enum {
FRA_TABLE, /* Extended table id */
FRA_FWMASK, /* mask for netfilter mark */
FRA_OIFNAME,
+ /*
+ * Android expects UID_START/UID_END here, but that
+ * collides with FRA_PAD and FRA_L3MDEV so add these
+ * hack entries to allow Android userspace to continue
+ * to work
+ */
+ FRA_ANDROID_ABI_HACK1,
+ FRA_ANDROID_ABI_HACK2,
FRA_PAD,
FRA_L3MDEV, /* iif or oif is l3mdev goto its table */
FRA_UID_RANGE, /* UID range */