[PATCH 3/6] rename rtnl_mirred_set_index() to rtnl_mirred_set_ifindex()

Cong Wang xiyou.wangcong at gmail.com
Thu Dec 5 18:48:27 EST 2013


Signed-off-by: Cong Wang <xiyou.wangcong at gmail.com>
---
 include/netlink/route/act/mirred.h   | 2 +-
 lib/route/act/mirred.c               | 4 ++--
 tests/test-u32-filter-with-actions.c | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/netlink/route/act/mirred.h b/include/netlink/route/act/mirred.h
index 0f9adf1..87da30c 100644
--- a/include/netlink/route/act/mirred.h
+++ b/include/netlink/route/act/mirred.h
@@ -22,7 +22,7 @@ extern "C" {
 #endif
 
 extern int rtnl_mirred_set_action(struct rtnl_act *, int);
-extern int rtnl_mirred_set_index(struct rtnl_act *, uint32_t);
+extern int rtnl_mirred_set_ifindex(struct rtnl_act *, uint32_t);
 extern int rtnl_mirred_set_policy(struct rtnl_act *, int);
 
 #ifdef __cplusplus
diff --git a/lib/route/act/mirred.c b/lib/route/act/mirred.c
index 43b223f..37deada 100644
--- a/lib/route/act/mirred.c
+++ b/lib/route/act/mirred.c
@@ -151,14 +151,14 @@ int rtnl_mirred_set_action(struct rtnl_act *act, int action)
 	return 0;
 }
 
-int rtnl_mirred_set_index(struct rtnl_act *act, uint32_t link)
+int rtnl_mirred_set_ifindex(struct rtnl_act *act, uint32_t ifindex)
 {
 	struct rtnl_mirred *u;
 
 	if (!(u = (struct rtnl_mirred *) rtnl_tc_data(TC_CAST(act))))
 		return -NLE_NOMEM;
 
-	u->m_parm.ifindex = link;
+	u->m_parm.ifindex = ifindex;
 	return 0;
 }
 
diff --git a/tests/test-u32-filter-with-actions.c b/tests/test-u32-filter-with-actions.c
index 706b464..55f913a 100644
--- a/tests/test-u32-filter-with-actions.c
+++ b/tests/test-u32-filter-with-actions.c
@@ -382,7 +382,7 @@ int main(void)
     rtnl_tc_set_kind(TC_CAST(act), "mirred");
     rtnl_mirred_set_action(act, TCA_EGRESS_REDIR);
     rtnl_mirred_set_policy(act, TC_ACT_STOLEN);
-    rtnl_mirred_set_index(act, rtnl_link_name2i(link_cache, "eth1"));
+    rtnl_mirred_set_ifindex(act, rtnl_link_name2i(link_cache, "eth1"));
     // /8 check
 
     // 10.0.0.0/8
-- 
1.8.3.1




More information about the libnl mailing list