summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorTom Herbert <tom@herbertland.com>2015-05-07 17:08:51 +0200
committerDavid S. Miller <davem@davemloft.net>2015-05-10 04:29:50 +0200
commit78f5b899195019f71f7593c604d75ca61658eae3 (patch)
tree6b97c54521d46419b6ed35ac2e8fd6ebc3e9a76d /include
parentMerge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsh... (diff)
downloadlinux-78f5b899195019f71f7593c604d75ca61658eae3.tar.xz
linux-78f5b899195019f71f7593c604d75ca61658eae3.zip
mpls: Change reserved label names to be consistent with netbsd
Since these are now visible to userspace it is nice to be consistent with BSD (sys/netmpls/mpls.h in netBSD). Signed-off-by: Tom Herbert <tom@herbertland.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r--include/uapi/linux/mpls.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/include/uapi/linux/mpls.h b/include/uapi/linux/mpls.h
index 0fe6ea5a41d5..139d4dd1cab8 100644
--- a/include/uapi/linux/mpls.h
+++ b/include/uapi/linux/mpls.h
@@ -32,13 +32,13 @@ struct mpls_label {
#define MPLS_LS_TTL_SHIFT 0
/* Reserved labels */
-#define MPLS_LABEL_IPV4_EXPLICIT_NULL 0 /* RFC3032 */
-#define MPLS_LABEL_ROUTER_ALERT 1 /* RFC3032 */
-#define MPLS_LABEL_IPV6_EXPLICIT_NULL 2 /* RFC3032 */
-#define MPLS_LABEL_IMPLICIT_NULL 3 /* RFC3032 */
-#define MPLS_LABEL_ENTROPY_INDICATOR 7 /* RFC6790 */
+#define MPLS_LABEL_IPV4NULL 0 /* RFC3032 */
+#define MPLS_LABEL_RTALERT 1 /* RFC3032 */
+#define MPLS_LABEL_IPV6NULL 2 /* RFC3032 */
+#define MPLS_LABEL_IMPLNULL 3 /* RFC3032 */
+#define MPLS_LABEL_ENTROPY 7 /* RFC6790 */
#define MPLS_LABEL_GAL 13 /* RFC5586 */
-#define MPLS_LABEL_OAM_ALERT 14 /* RFC3429 */
+#define MPLS_LABEL_OAMALERT 14 /* RFC3429 */
#define MPLS_LABEL_EXTENSION 15 /* RFC7274 */
#endif /* _UAPI_MPLS_H */