commit 3eb608f429435a9d4c038ae132f50e99f17d5a25
author Linux Build Service Account <lnxbuild@quicinc.com> Fri May 19 15:56:42 2017 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri May 19 15:56:42 2017 -0700
tree 1ce612f3ec69f975eb35fe3cb05d8fc01f00c4b7
parent 60b77fc9a212810d0d1e32c056e91b3181239136
parent af8c23d6c5e6bd92f23ba19873acd24306deb814

Merge "[qca-ssdk-shell] fix acl dscp range check issue"

include/fal/fal_policer.h

diff --git a/include/fal/fal_policer.h b/include/fal/fal_policer.h
index a563903..7a64634 100755
--- a/include/fal/fal_policer.h
+++ b/include/fal/fal_policer.h
@@ -36,8 +36,8 @@
 	a_uint32_t 	meter_mode;
 	a_uint32_t	meter_unit; /* 0:byte based; 1:packet based*/
 	a_uint32_t	cir;	/* committed information rate */
-	a_uint32_t	eir;	/* committed burst size */
-	a_uint32_t	cbs; /* excess information rate */
+	a_uint32_t	cbs;	/* committed burst size */
+	a_uint32_t	eir; /* excess information rate */
 	a_uint32_t	ebs; /* excess burst size */
 } fal_policer_config_t;
 
@@ -51,7 +51,7 @@
 	a_uint32_t yellow_drop_priority; /* yellow traffic internal drop priority value*/
 	a_uint32_t yellow_pcp; /* yellow traffic pcp value*/
 	a_uint32_t yellow_dei; /* yellow traffic dei value*/
-	fal_fwd_cmd_t red_action; /* red traffic drop or remark, 0 drop; 1 remark*/
+	fal_fwd_cmd_t red_action; /* red traffic drop or forward*/
 	a_bool_t red_priority_en; /* red traffic internal priority change enable*/
 	a_bool_t red_drop_priority_en; /* red traffic internal drop priority change enable*/
 	a_bool_t red_pcp_en; /* red traffic pcp change enable*/

src/fal_uk/fal_policer.c

diff --git a/src/fal_uk/fal_policer.c b/src/fal_uk/fal_policer.c
index 5fd70bf..3897562 100755
--- a/src/fal_uk/fal_policer.c
+++ b/src/fal_uk/fal_policer.c
@@ -104,23 +104,23 @@
 }
 
 sw_error_t
-fal_acl_policer_entry_set(a_uint32_t dev_id, fal_port_t port_id,
+fal_acl_policer_entry_set(a_uint32_t dev_id, a_uint32_t index,
 		fal_policer_config_t *policer, fal_policer_action_t *action)
 {
     sw_error_t rv;
 
-    rv = sw_uk_exec(SW_API_POLICER_ACL_ENTRY_SET, dev_id, port_id,
+    rv = sw_uk_exec(SW_API_POLICER_ACL_ENTRY_SET, dev_id, index,
 		policer, action);
     return rv;
 }
 
 sw_error_t
-fal_acl_policer_entry_get(a_uint32_t dev_id, fal_port_t port_id,
+fal_acl_policer_entry_get(a_uint32_t dev_id, a_uint32_t index,
 		fal_policer_config_t *policer, fal_policer_action_t *action)
 {
     sw_error_t rv;
 
-    rv = sw_uk_exec(SW_API_POLICER_ACL_ENTRY_GET, dev_id, port_id,
+    rv = sw_uk_exec(SW_API_POLICER_ACL_ENTRY_GET, dev_id, index,
 		policer, action);
     return rv;
 }

src/shell/shell_config.c

diff --git a/src/shell/shell_config.c b/src/shell/shell_config.c
index ca97e96..8ea8860 100755
--- a/src/shell/shell_config.c
+++ b/src/shell/shell_config.c
@@ -1070,8 +1070,8 @@
             {"phycounter",  "set", "set counter status of a port",   "<port_id> <enable|disable>", SW_API_DEBUG_PHYCOUNTER_SET, NULL},
             {"phycounter",  "get", "get counter status of a port",   "<port_id>", SW_API_DEBUG_PHYCOUNTER_GET, NULL},
             {"phycounter",  "show", "show counter of a port",   "<port_id>", SW_API_DEBUG_PHYCOUNTER_SHOW, NULL},
-            {"uniphy", "get", "read uniphy register", "<reg_addr> <uniphy_index> <4>", SW_API_UNIPHY_REG_GET, NULL},
-            {"uniphy", "set", "write uniphy register", "<reg_addr> <uniphy_index> <value> <4>", SW_API_UNIPHY_REG_SET, NULL},
+            {"uniphy", "get", "read uniphy register", "<uniphy_index> <reg_addr> <4>", SW_API_UNIPHY_REG_GET, NULL},
+            {"uniphy", "set", "write uniphy register", "<uniphy_index> <reg_addr> <value> <4>", SW_API_UNIPHY_REG_SET, NULL},
             {NULL, NULL, NULL, NULL, (int)NULL, NULL}/*end of desc*/
         },
     },