Use 16bit ints for classifier prio/protocol

diff --git a/include/netlink-types.h b/include/netlink-types.h
index 238b131dbc6ffdb39f8ecc2bf8c6c6b394933f72..cddace93385e5d30b62597a7a26a949bd2e6d8f8 100644 (file)
--- a/include/netlink-types.h
+++ b/include/netlink-types.h
@@ -475,8 +475,8 @@ struct rtnl_class
 struct rtnl_cls
 {
        NL_TCA_GENERIC(c);
-       uint32_t        c_prio;
-       uint32_t        c_protocol;
+       uint16_t        c_prio;
+       uint16_t        c_protocol;
        struct rtnl_cls_ops     *c_ops;
 };
 

diff --git a/include/netlink/route/classifier.h b/include/netlink/route/classifier.h
index 0c0b9c54c0e0ad4c023affab90455eec42b859a8..01a26a932de172737d7ba08f3fd579a08a6597d5 100644 (file)
--- a/include/netlink/route/classifier.h
+++ b/include/netlink/route/classifier.h
@@ -44,11 +44,11 @@ extern void rtnl_cls_set_handle(struct rtnl_cls *, uint32_t);
 extern void rtnl_cls_set_parent(struct rtnl_cls *, uint32_t);
 extern void rtnl_cls_set_kind(struct rtnl_cls *, const char *);
 
-extern void rtnl_cls_set_prio(struct rtnl_cls *, int);
-extern int  rtnl_cls_get_prio(struct rtnl_cls *);
+extern void rtnl_cls_set_prio(struct rtnl_cls *, uint16_t);
+extern uint16_t rtnl_cls_get_prio(struct rtnl_cls *);
 
-extern void rtnl_cls_set_protocol(struct rtnl_cls *, int);
-extern int  rtnl_cls_get_protocol(struct rtnl_cls *);
+extern void rtnl_cls_set_protocol(struct rtnl_cls *, uint16_t);
+extern uint16_t rtnl_cls_get_protocol(struct rtnl_cls *);
 
 #ifdef __cplusplus
 }

diff --git a/lib/route/cls_obj.c b/lib/route/cls_obj.c
index 500ee5a574cdf8dba3de5bd47da228f57101424d..6c92572ac2519203b5039c6709468f7d2fe39c3f 100644 (file)
--- a/lib/route/cls_obj.c
+++ b/lib/route/cls_obj.c
@@ -149,13 +149,13 @@ void rtnl_cls_set_kind(struct rtnl_cls *f, const char *kind)
        f->c_ops = __rtnl_cls_lookup_ops(kind);
 }
 
-void rtnl_cls_set_prio(struct rtnl_cls *cls, int prio)
+void rtnl_cls_set_prio(struct rtnl_cls *cls, uint16_t prio)
 {
        cls->c_prio = prio;
        cls->ce_mask |= CLS_ATTR_PRIO;
 }
 
-int rtnl_cls_get_prio(struct rtnl_cls *cls)
+uint16_t rtnl_cls_get_prio(struct rtnl_cls *cls)
 {
        if (cls->ce_mask & CLS_ATTR_PRIO)
                return cls->c_prio;
@@ -163,13 +163,13 @@ int rtnl_cls_get_prio(struct rtnl_cls *cls)
                return 0;
 }
 
-void rtnl_cls_set_protocol(struct rtnl_cls *cls, int protocol)
+void rtnl_cls_set_protocol(struct rtnl_cls *cls, uint16_t protocol)
 {
        cls->c_protocol = protocol;
        cls->ce_mask |= CLS_ATTR_PROTOCOL;
 }
 
-int rtnl_cls_get_protocol(struct rtnl_cls *cls)
+uint16_t rtnl_cls_get_protocol(struct rtnl_cls *cls)
 {
        if (cls->ce_mask & CLS_ATTR_PROTOCOL)
                return cls->c_protocol;