@@ -23,7 +23,6 @@ struct linkmap_entry {
2323 int ifindex ;
2424 char ifname [IFNAMSIZ + 1 ];
2525 int net ;
26- uint8_t medium ;
2726 bool up ;
2827
2928 mctp_eid_t * local_eids ;
@@ -56,7 +55,7 @@ static int fill_local_addrs(mctp_nl *nl);
5655static int fill_linkmap (mctp_nl * nl );
5756static void sort_linkmap (mctp_nl * nl );
5857static 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 ,
6059 bool up );
6160static struct linkmap_entry * entry_byindex (const mctp_nl * nl ,
6261 int index );
@@ -675,7 +674,6 @@ static int parse_getlink_dump(mctp_nl *nl, struct nlmsghdr *nlh, uint32_t len)
675674 char * ifname ;
676675 size_t ifname_len , rlen , nlen , mlen ;
677676 uint32_t net ;
678- uint8_t medium = 0x00 ;
679677 bool up ;
680678
681679 if (nlh -> nlmsg_type == NLMSG_DONE )
@@ -717,7 +715,7 @@ static int parse_getlink_dump(mctp_nl *nl, struct nlmsghdr *nlh, uint32_t len)
717715 }
718716 ifname_len = strnlen (ifname , ifname_len );
719717 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 );
721719 }
722720 // Not done.
723721 return 1 ;
@@ -888,9 +886,9 @@ void mctp_nl_linkmap_dump(const mctp_nl *nl)
888886 for (i = 0 ; i < nl -> linkmap_count ; i ++ ) {
889887 struct linkmap_entry * entry = & nl -> linkmap [i ];
890888 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 [" ,
892890 entry -> ifindex , entry -> ifname ,
893- entry -> net , entry -> medium , updown );
891+ entry -> net , updown );
894892 for (j = 0 ; j < entry -> num_local ; j ++ ) {
895893 if (j != 0 )
896894 printf (", " );
@@ -1018,7 +1016,7 @@ int *mctp_nl_if_list(const mctp_nl *nl, size_t *ret_num_ifs)
10181016}
10191017
10201018static 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 ,
10221020 bool up )
10231021{
10241022 struct linkmap_entry * entry ;
@@ -1054,7 +1052,6 @@ static int linkmap_add_entry(mctp_nl *nl, struct ifinfomsg *info,
10541052 snprintf (entry -> ifname , IFNAMSIZ , "%*s" , (int )ifname_len , ifname );
10551053 entry -> ifindex = info -> ifi_index ;
10561054 entry -> net = net ;
1057- entry -> medium = medium ;
10581055 entry -> up = up ;
10591056 return 0 ;
10601057}
0 commit comments