diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2017-01-03 11:23:35 -0800 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2017-01-03 11:23:35 -0800 |
| commit | aceae9be74c70f993ddd8d6a157f1a256591c43f (patch) | |
| tree | d8ef291e4467dfd1d28e31e8a2f38049fdcece2c /include/uapi/linux/rtnetlink.h | |
| parent | 9b133b6207826ae8cbe5f7de0b407253191e98fa (diff) | |
| parent | 676b8efcce52d582153d3df3bc90689cab07a058 (diff) | |
Merge remote-tracking branch 'common/android-4.4' into android-4.4.y
Change-Id: I44dc2744898ca59ad15cd77b49ad84da0220250a
Diffstat (limited to 'include/uapi/linux/rtnetlink.h')
| -rw-r--r-- | include/uapi/linux/rtnetlink.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/uapi/linux/rtnetlink.h b/include/uapi/linux/rtnetlink.h index a2fad11894ff..d7d7599b112a 100644 --- a/include/uapi/linux/rtnetlink.h +++ b/include/uapi/linux/rtnetlink.h @@ -306,12 +306,14 @@ 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_EXPIRES, + RTA_PAD, + RTA_UID, __RTA_MAX }; |