mirror of
https://git.rtems.org/rtems-libbsd/
synced 2025-10-14 05:11:15 +08:00
Update to FreeBSD head 2018-04-01
Git mirror commit 8dfb1ccc26d1cea7e2529303003ff61f9f1784c4. Update #3472.
This commit is contained in:
@@ -74,7 +74,6 @@ __FBSDID("$FreeBSD$");
|
||||
#include <net/if_dl.h>
|
||||
#include <net/if_types.h>
|
||||
#include <net/route.h>
|
||||
#include <net/iso88025.h>
|
||||
|
||||
#include <netinet/in.h>
|
||||
#include <netinet/if_ether.h>
|
||||
@@ -354,7 +353,6 @@ valid_type(int type)
|
||||
case IFT_INFINIBAND:
|
||||
case IFT_ISO88023:
|
||||
case IFT_ISO88024:
|
||||
case IFT_ISO88025:
|
||||
case IFT_L2VLAN:
|
||||
case IFT_BRIDGE:
|
||||
return (1);
|
||||
@@ -643,9 +641,7 @@ print_entry(struct sockaddr_dl *sdl,
|
||||
{
|
||||
const char *host;
|
||||
struct hostent *hp;
|
||||
struct iso88025_sockaddr_dl_data *trld;
|
||||
struct if_nameindex *p;
|
||||
int seg;
|
||||
|
||||
if (ifnameindex == NULL)
|
||||
if ((ifnameindex = if_nameindex()) == NULL)
|
||||
@@ -712,17 +708,6 @@ print_entry(struct sockaddr_dl *sdl,
|
||||
case IFT_ETHER:
|
||||
xo_emit(" [{:type/ethernet}]");
|
||||
break;
|
||||
case IFT_ISO88025:
|
||||
xo_emit(" [{:type/token-ring}]");
|
||||
trld = SDL_ISO88025(sdl);
|
||||
if (trld->trld_rcf != 0) {
|
||||
xo_emit(" rt=%x", ntohs(trld->trld_rcf));
|
||||
for (seg = 0;
|
||||
seg < ((TR_RCF_RIFLEN(trld->trld_rcf) - 2 ) / 2);
|
||||
seg++)
|
||||
xo_emit(":%x", ntohs(*(trld->trld_route[seg])));
|
||||
}
|
||||
break;
|
||||
case IFT_FDDI:
|
||||
xo_emit(" [{:type/fddi}]");
|
||||
break;
|
||||
|
Reference in New Issue
Block a user