@@ -23,7 +23,6 @@ struct linkmap_entry {
23
23
int ifindex ;
24
24
char ifname [IFNAMSIZ + 1 ];
25
25
int net ;
26
- uint8_t medium ;
27
26
bool up ;
28
27
29
28
mctp_eid_t * local_eids ;
@@ -56,7 +55,7 @@ static int fill_local_addrs(mctp_nl *nl);
56
55
static int fill_linkmap (mctp_nl * nl );
57
56
static void sort_linkmap (mctp_nl * nl );
58
57
static int linkmap_add_entry (mctp_nl * nl , struct ifinfomsg * info ,
59
- const char * ifname , size_t ifname_len , int net , uint8_t medium ,
58
+ const char * ifname , size_t ifname_len , int net ,
60
59
bool up );
61
60
static struct linkmap_entry * entry_byindex (const mctp_nl * nl ,
62
61
int index );
@@ -675,7 +674,6 @@ static int parse_getlink_dump(mctp_nl *nl, struct nlmsghdr *nlh, uint32_t len)
675
674
char * ifname ;
676
675
size_t ifname_len , rlen , nlen , mlen ;
677
676
uint32_t net ;
678
- uint8_t medium = 0x00 ;
679
677
bool up ;
680
678
681
679
if (nlh -> nlmsg_type == NLMSG_DONE )
@@ -717,7 +715,7 @@ static int parse_getlink_dump(mctp_nl *nl, struct nlmsghdr *nlh, uint32_t len)
717
715
}
718
716
ifname_len = strnlen (ifname , ifname_len );
719
717
up = info -> ifi_flags & IFF_UP ;
720
- linkmap_add_entry (nl , info , ifname , ifname_len , net , medium , up );
718
+ linkmap_add_entry (nl , info , ifname , ifname_len , net , up );
721
719
}
722
720
// Not done.
723
721
return 1 ;
@@ -888,9 +886,9 @@ void mctp_nl_linkmap_dump(const mctp_nl *nl)
888
886
for (i = 0 ; i < nl -> linkmap_count ; i ++ ) {
889
887
struct linkmap_entry * entry = & nl -> linkmap [i ];
890
888
const char * updown = entry -> up ? "up" : "DOWN" ;
891
- printf (" %2d: %s, net %d med 0x%02x %s local addrs [" ,
889
+ printf (" %2d: %s, net %d %s local addrs [" ,
892
890
entry -> ifindex , entry -> ifname ,
893
- entry -> net , entry -> medium , updown );
891
+ entry -> net , updown );
894
892
for (j = 0 ; j < entry -> num_local ; j ++ ) {
895
893
if (j != 0 )
896
894
printf (", " );
@@ -1018,7 +1016,7 @@ int *mctp_nl_if_list(const mctp_nl *nl, size_t *ret_num_ifs)
1018
1016
}
1019
1017
1020
1018
static int linkmap_add_entry (mctp_nl * nl , struct ifinfomsg * info ,
1021
- const char * ifname , size_t ifname_len , int net , uint8_t medium ,
1019
+ const char * ifname , size_t ifname_len , int net ,
1022
1020
bool up )
1023
1021
{
1024
1022
struct linkmap_entry * entry ;
@@ -1054,7 +1052,6 @@ static int linkmap_add_entry(mctp_nl *nl, struct ifinfomsg *info,
1054
1052
snprintf (entry -> ifname , IFNAMSIZ , "%*s" , (int )ifname_len , ifname );
1055
1053
entry -> ifindex = info -> ifi_index ;
1056
1054
entry -> net = net ;
1057
- entry -> medium = medium ;
1058
1055
entry -> up = up ;
1059
1056
return 0 ;
1060
1057
}
0 commit comments