diff options
author | Brian Norris <computersforpeace@gmail.com> | 2015-09-13 18:41:29 -0700 |
---|---|---|
committer | Brian Norris <computersforpeace@gmail.com> | 2015-09-13 18:41:29 -0700 |
commit | db66e32e0d2ae1f5070faa589aa460b75780ab47 (patch) | |
tree | feafcfb8f6ae92fabcd4de7d83e839cc301530bc /include/uapi/linux/mpls.h | |
parent | f9f3ce835ddce3c669eee869253105f88819888b (diff) | |
parent | 6ff33f3902c3b1c5d0db6b1e2c70b6d76fba357f (diff) | |
download | op-kernel-dev-db66e32e0d2ae1f5070faa589aa460b75780ab47.zip op-kernel-dev-db66e32e0d2ae1f5070faa589aa460b75780ab47.tar.gz |
Merge tag 'v4.3-rc1' into MTD -next development
Diffstat (limited to 'include/uapi/linux/mpls.h')
-rw-r--r-- | include/uapi/linux/mpls.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/uapi/linux/mpls.h b/include/uapi/linux/mpls.h index 139d4dd..24a6cb1 100644 --- a/include/uapi/linux/mpls.h +++ b/include/uapi/linux/mpls.h @@ -41,4 +41,6 @@ struct mpls_label { #define MPLS_LABEL_OAMALERT 14 /* RFC3429 */ #define MPLS_LABEL_EXTENSION 15 /* RFC7274 */ +#define MPLS_LABEL_FIRST_UNRESERVED 16 /* RFC3032 */ + #endif /* _UAPI_MPLS_H */ |