summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDonald Sharp <sharpd@cumulusnetworks.com>2017-12-05 01:29:42 +0100
committerDonald Sharp <sharpd@cumulusnetworks.com>2017-12-05 03:28:19 +0100
commitedb1d4a09acdf27c04ce27adf1b06e4faa86454a (patch)
treeb0e94b44fe0d8b62cee3924b84d694409eaac78c
parentMerge pull request #1518 from opensourcerouting/clippy-issues (diff)
downloadfrr-edb1d4a09acdf27c04ce27adf1b06e4faa86454a.tar.xz
frr-edb1d4a09acdf27c04ce27adf1b06e4faa86454a.zip
babeld: if_eui64 never uses ifname
Remove this variable. Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
-rw-r--r--babeld/babeld.c4
-rw-r--r--babeld/kernel.c2
-rw-r--r--babeld/kernel.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/babeld/babeld.c b/babeld/babeld.c
index 00367612c..20dd098f3 100644
--- a/babeld/babeld.c
+++ b/babeld/babeld.c
@@ -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);
diff --git a/babeld/kernel.c b/babeld/kernel.c
index 3343ca2e9..8c4fc953e 100644
--- a/babeld/kernel.c
+++ b/babeld/kernel.c
@@ -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) {
diff --git a/babeld/kernel.h b/babeld/kernel.h
index 7ade26dc3..eb1e79327 100644
--- a/babeld/kernel.h
+++ b/babeld/kernel.h
@@ -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);