diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2016-08-12 14:20:42 -0700 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2016-08-12 14:20:42 -0700 |
| commit | 8e4f993802d3d853d5377b9aaa8df28926140077 (patch) | |
| tree | 3e7f0636ce97b7f5006ff1f2c774b034d5b630cc /include/uapi/linux | |
| parent | 1f369b24e2987c1b29c88ffcbd0ca99cddabe01c (diff) | |
| parent | aa3cda16a57e73e9fc269e1de1eb3c35f3f0ed20 (diff) | |
Merge remote-tracking branch 'common/android-4.4' into android-4.4.y
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/rtnetlink.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/linux/rtnetlink.h b/include/uapi/linux/rtnetlink.h index 355eea225dd9..3eb02a1d6d8c 100644 --- a/include/uapi/linux/rtnetlink.h +++ b/include/uapi/linux/rtnetlink.h @@ -306,12 +306,12 @@ enum rtattr_type_t { RTA_TABLE, RTA_MARK, RTA_MFC_STATS, + RTA_UID, RTA_VIA, RTA_NEWDST, RTA_PREF, RTA_ENCAP_TYPE, RTA_ENCAP, - RTA_UID, __RTA_MAX }; |