proxmox-mirrors/mirror_iproute2
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_iproute2 synced 2025-12-08 09:24:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ll_map: remove unused address fields

Browse Source 
The address was being stored but not used by current code.
This commit is contained in:
Stephen Hemminger 2013-03-27 09:26:25 -07:00
parent 1b95cb8d6b
commit 3e26112a02
2 changed files with 0 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/ll_map.h
View File

@ -9,7 +9,5 @@ extern const char *ll_index_to_name(unsigned idx);
extern const char *ll_idx_n2a(unsigned idx, char *buf); extern const char *ll_idx_n2a(unsigned idx, char *buf);
extern int ll_index_to_type(unsigned idx); extern int ll_index_to_type(unsigned idx);
extern unsigned ll_index_to_flags(unsigned idx); extern unsigned ll_index_to_flags(unsigned idx);
extern unsigned ll_index_to_addr(unsigned idx, unsigned char *addr,
unsigned alen);
#endif /* __LL_MAP_H__ */ #endif /* __LL_MAP_H__ */

33
lib/ll_map.c
View File

@ -31,9 +31,7 @@ struct ll_cache
unsigned flags; unsigned flags;
int index; int index;
unsigned short type; unsigned short type;
unsigned short alen;
char name[IFNAMSIZ]; char name[IFNAMSIZ];
unsigned char addr[20];
}; };
#define IDXMAP_SIZE 1024 #define IDXMAP_SIZE 1024
@ -79,16 +77,6 @@ int ll_remember_index(const struct sockaddr_nl *who,
im->type = ifi->ifi_type; im->type = ifi->ifi_type;
im->flags = ifi->ifi_flags; im->flags = ifi->ifi_flags;
if (tb[IFLA_ADDRESS]) {
int alen;
im->alen = alen = RTA_PAYLOAD(tb[IFLA_ADDRESS]);
if (alen > sizeof(im->addr))
alen = sizeof(im->addr);
memcpy(im->addr, RTA_DATA(tb[IFLA_ADDRESS]), alen);
} else {
im->alen = 0;
memset(im->addr, 0, sizeof(im->addr));
}
strcpy(im->name, RTA_DATA(tb[IFLA_IFNAME])); strcpy(im->name, RTA_DATA(tb[IFLA_IFNAME]));
return 0; return 0;
} }
@ -141,27 +129,6 @@ unsigned ll_index_to_flags(unsigned idx)
return 0; return 0;
} }
unsigned ll_index_to_addr(unsigned idx, unsigned char *addr,
unsigned alen)
{
const struct ll_cache *im;
if (idx == 0)
return 0;
for (im = idxhead(idx); im; im = im->idx_next) {
if (im->index == idx) {
if (alen > sizeof(im->addr))
alen = sizeof(im->addr);
if (alen > im->alen)
alen = im->alen;
memcpy(addr, im->addr, alen);
return alen;
}
}
return 0;
}
unsigned ll_name_to_index(const char *name) unsigned ll_name_to_index(const char *name)
{ {
static char ncache[IFNAMSIZ]; static char ncache[IFNAMSIZ];