|
 |
4b2fc1 |
From 174b2a34a7c6a2fcf75baefd2f96c78a60c5417f Mon Sep 17 00:00:00 2001
|
|
|
4b2fc1 |
From: Phil Sutter <psutter@redhat.com>
|
|
|
4b2fc1 |
Date: Fri, 12 May 2017 17:56:59 +0200
|
|
|
4b2fc1 |
Subject: [PATCH] src: rename datatype name from tc_handle to classid
|
|
|
4b2fc1 |
|
|
|
4b2fc1 |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1380326
|
|
|
4b2fc1 |
Upstream Status: nftables commit 11b39df32835c
|
|
|
4b2fc1 |
|
|
|
4b2fc1 |
commit 11b39df32835ce855e5c6b889fa2cbcefe517547
|
|
|
4b2fc1 |
Author: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
4b2fc1 |
Date: Fri Jul 22 16:43:13 2016 +0200
|
|
|
4b2fc1 |
|
|
|
4b2fc1 |
src: rename datatype name from tc_handle to classid
|
|
|
4b2fc1 |
|
|
|
4b2fc1 |
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
4b2fc1 |
---
|
|
|
4b2fc1 |
include/datatype.h | 4 ++--
|
|
|
4b2fc1 |
src/meta.c | 6 +++---
|
|
|
4b2fc1 |
2 files changed, 5 insertions(+), 5 deletions(-)
|
|
|
4b2fc1 |
|
|
|
4b2fc1 |
diff --git a/include/datatype.h b/include/datatype.h
|
|
|
4b2fc1 |
index c7e110f..f0e085b 100644
|
|
|
4b2fc1 |
--- a/include/datatype.h
|
|
|
4b2fc1 |
+++ b/include/datatype.h
|
|
|
4b2fc1 |
@@ -27,7 +27,7 @@
|
|
|
4b2fc1 |
* @TYPE_IFINDEX: interface index (integer subtype)
|
|
|
4b2fc1 |
* @TYPE_ARPHRD: interface type (integer subtype)
|
|
|
4b2fc1 |
* @TYPE_REALM: routing realm (integer subtype)
|
|
|
4b2fc1 |
- * @TYPE_TC_HANDLE: TC handle (integer subtype)
|
|
|
4b2fc1 |
+ * @TYPE_CLASSID: TC classid (integer subtype)
|
|
|
4b2fc1 |
* @TYPE_UID: user ID (integer subtype)
|
|
|
4b2fc1 |
* @TYPE_GID: group ID (integer subtype)
|
|
|
4b2fc1 |
* @TYPE_CT_STATE: conntrack state (bitmask subtype)
|
|
|
4b2fc1 |
@@ -66,7 +66,7 @@ enum datatypes {
|
|
|
4b2fc1 |
TYPE_IFINDEX,
|
|
|
4b2fc1 |
TYPE_ARPHRD,
|
|
|
4b2fc1 |
TYPE_REALM,
|
|
|
4b2fc1 |
- TYPE_TC_HANDLE,
|
|
|
4b2fc1 |
+ TYPE_CLASSID,
|
|
|
4b2fc1 |
TYPE_UID,
|
|
|
4b2fc1 |
TYPE_GID,
|
|
|
4b2fc1 |
TYPE_CT_STATE,
|
|
|
4b2fc1 |
diff --git a/src/meta.c b/src/meta.c
|
|
|
4b2fc1 |
index 75431a2..d912b4e 100644
|
|
|
4b2fc1 |
--- a/src/meta.c
|
|
|
4b2fc1 |
+++ b/src/meta.c
|
|
|
4b2fc1 |
@@ -127,9 +127,9 @@ err:
|
|
|
4b2fc1 |
}
|
|
|
4b2fc1 |
|
|
|
4b2fc1 |
static const struct datatype tchandle_type = {
|
|
|
4b2fc1 |
- .type = TYPE_TC_HANDLE,
|
|
|
4b2fc1 |
- .name = "tc_handle",
|
|
|
4b2fc1 |
- .desc = "TC handle",
|
|
|
4b2fc1 |
+ .type = TYPE_CLASSID,
|
|
|
4b2fc1 |
+ .name = "classid",
|
|
|
4b2fc1 |
+ .desc = "TC classid",
|
|
|
4b2fc1 |
.byteorder = BYTEORDER_HOST_ENDIAN,
|
|
|
4b2fc1 |
.size = 4 * BITS_PER_BYTE,
|
|
|
4b2fc1 |
.basetype = &integer_type,
|
|
|
4b2fc1 |
--
|
|
|
4b2fc1 |
1.8.3.1
|
|
|
4b2fc1 |
|