]> git.puffer.fish Git - matthieu/frr.git/commitdiff
babeld: if_eui64 never uses ifname
authorDonald Sharp <sharpd@cumulusnetworks.com>
Tue, 5 Dec 2017 00:29:42 +0000 (19:29 -0500)
committerDonald Sharp <sharpd@cumulusnetworks.com>
Tue, 5 Dec 2017 02:28:19 +0000 (21:28 -0500)
Remove this variable.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
babeld/babeld.c
babeld/kernel.c
babeld/kernel.h

index 00367612c624d94d97e9b6be14d3fe1ecb84c527..20dd098f33026754713b51f3b2c642c570ea5257 100644 (file)
@@ -229,7 +229,7 @@ babel_get_myid(void)
         int ifindex = if_nametoindex(ifp->name);
         if(ifindex > 0) {
             unsigned char eui[8];
-            rc = if_eui64(ifp->name, ifindex, eui);
+            rc = if_eui64(ifindex, eui);
             if(rc < 0)
                 continue;
             memcpy(myid, eui, 8);
@@ -245,7 +245,7 @@ babel_get_myid(void)
         ifname = if_indextoname(i, buf);
         if(ifname == NULL)
             continue;
-        rc = if_eui64(ifname, i, eui);
+        rc = if_eui64(i, eui);
         if(rc < 0)
             continue;
         memcpy(myid, eui, 8);
index 3343ca2e9538a3acba11a10a72d6be72df0ad0f7..8c4fc953e7abe217599dac2514f1bb1c4d96b33f 100644 (file)
@@ -203,7 +203,7 @@ zebra_route(int add, int family, const unsigned char *pref, unsigned short plen,
 }
 
 int
-if_eui64(char *ifname, int ifindex, unsigned char *eui)
+if_eui64(int ifindex, unsigned char *eui)
 {
     struct interface *ifp = if_lookup_by_index(ifindex, VRF_DEFAULT);
     if (ifp == NULL) {
index 7ade26dc3655948691fe27b75d7df2fcfc383ce7..eb1e793279c52b9b4c5878d6a592d0df3c9bc060 100644 (file)
@@ -40,7 +40,7 @@ int kernel_route(int operation, const unsigned char *dest, unsigned short plen,
                  const unsigned char *gate, int ifindex, unsigned int metric,
                  const unsigned char *newgate, int newifindex,
                  unsigned int newmetric);
-int if_eui64(char *ifname, int ifindex, unsigned char *eui);
+int if_eui64(int ifindex, unsigned char *eui);
 int gettime(struct timeval *tv);
 int read_random_bytes(void *buf, size_t len);