ip: remove unnecessary ll_init_map

Don't call ll_init_map on modify operations
Saves significant overhead with 1000's of devices.

diff --git a/ip/ipaddress.c b/ip/ipaddress.c
index 149df69d2a09c37fea9527c68ebe7a27a136f330..5b9a438545147a09fd816adfeaeda82b107d932f 100644 (file)
--- a/ip/ipaddress.c
+++ b/ip/ipaddress.c
@@ -1365,8 +1365,6 @@ static int ipaddr_modify(int cmd, int flags, int argc, char **argv)
        if (!scoped && cmd != RTM_DELADDR)
                req.ifa.ifa_scope = default_scope(&lcl);
 
-       ll_init_map(&rth);
-
        if ((req.ifa.ifa_index = ll_name_to_index(d)) == 0) {
                fprintf(stderr, "Cannot find device \"%s\"\n", d);
                return -1;

diff --git a/ip/ipaddrlabel.c b/ip/ipaddrlabel.c
index eb6a48c4dac6d54a0e5712b3a39938f8c225c901..1789d9c18eac3df92f3df19272c5b48eb80726d8 100644 (file)
--- a/ip/ipaddrlabel.c
+++ b/ip/ipaddrlabel.c
@@ -246,8 +246,6 @@ static int ipaddrlabel_flush(int argc, char **argv)
 
 int do_ipaddrlabel(int argc, char **argv)
 {
-       ll_init_map(&rth);
-
        if (argc < 1) {
                return ipaddrlabel_list(0, NULL);
        } else if (matches(argv[0], "list") == 0 ||

diff --git a/ip/iplink.c b/ip/iplink.c
index 5c7b43cf72cb3b8dabae2925cdbdd870a30a10ca..dc9801954ded1e64169a954ea0c8dde6795a622f 100644 (file)
--- a/ip/iplink.c
+++ b/ip/iplink.c
@@ -533,8 +533,6 @@ static int iplink_modify(int cmd, unsigned int flags, int argc, char **argv)
                }
        }
 
-       ll_init_map(&rth);
-
        if (!(flags & NLM_F_CREATE)) {
                if (!dev) {
                        fprintf(stderr, "Not enough information: \"dev\" "

diff --git a/ip/iproute.c b/ip/iproute.c
index 2c2a3319331f96b22d7717ad0078eadd4ff51606..adef7740872cb41df8214dd5ca595828030dbde7 100644 (file)
--- a/ip/iproute.c
+++ b/ip/iproute.c
@@ -970,8 +970,6 @@ static int iproute_modify(int cmd, unsigned flags, int argc, char **argv)
        if (d || nhs_ok)  {
                int idx;
 
-               ll_init_map(&rth);
-
                if (d) {
                        if ((idx = ll_name_to_index(d)) == 0) {
                                fprintf(stderr, "Cannot find device \"%s\"\n", d);
@@ -1265,8 +1263,6 @@ static int iproute_list_flush_or_save(int argc, char **argv, int action)
        if (do_ipv6 == AF_UNSPEC && filter.tb)
                do_ipv6 = AF_INET;
 
-       ll_init_map(&rth);
-
        if (id || od)  {
                int idx;
 
@@ -1452,8 +1448,6 @@ static int iproute_get(int argc, char **argv)
                exit(1);
        }
 
-       ll_init_map(&rth);
-
        if (idev || odev)  {
                int idx;
 

diff --git a/ip/xfrm_monitor.c b/ip/xfrm_monitor.c
index bfc48f1b516b8571c4aae835af186a784fe3c254..a1f5d53d468dafde934cad6f66d78a7e1b90f332 100644 (file)
--- a/ip/xfrm_monitor.c
+++ b/ip/xfrm_monitor.c
@@ -408,8 +408,6 @@ int do_xfrm_monitor(int argc, char **argv)
                return rtnl_from_file(fp, xfrm_accept_msg, (void*)stdout);
        }
 
-       //ll_init_map(&rth);
-
        if (rtnl_open_byproto(&rth, groups, NETLINK_XFRM) < 0)
                exit(1);