d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use a unique error message if we fail to find the simple network protocol.

Browse Source 
While here, fix the various net driver callbacks to return early instead
of crashing if this fails.  (The 'init' callback from the netif interface
doesn't return an error if the protocol lookup fails.)

Sponsored by:	Cisco Systems
This commit is contained in:
jhb 2016-05-26 23:08:57 +00:00
parent e075851d35
commit 8c87c3cb87
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/boot/efi/libefi/efinet.c
View File

@ -122,6 +122,8 @@ efinet_put(struct iodesc *desc, void *pkt, size_t len)
void *buf;
net = nif->nif_devdata;
if (net == NULL)
return (-1);
status = net->Transmit(net, 0, len, pkt, 0, 0, 0);
if (status != EFI_SUCCESS)
@ -152,6 +154,8 @@ efinet_get(struct iodesc *desc, void *pkt, size_t len, time_t timeout)
char buf[2048];
net = nif->nif_devdata;
if (net == NULL)
return (0);
t = time(0);
while ((time(0) - t) < timeout) {
@ -192,7 +196,7 @@ efinet_init(struct iodesc *desc, void *machdep_hint)
h = nif->nif_driver->netif_ifs[nif->nif_unit].dif_private;
status = BS->HandleProtocol(h, &sn_guid, (VOID **)&nif->nif_devdata);
if (status != EFI_SUCCESS) {
printf("net%d: cannot start interface (status=%lu)\n",
printf("net%d: cannot fetch interface data (status=%lu)\n",
nif->nif_unit, EFI_ERROR_CODE(status));
return;
}
@ -241,6 +245,9 @@ efinet_end(struct netif *nif)
{
EFI_SIMPLE_NETWORK *net = nif->nif_devdata;
if (net == NULL)
return;
net->Shutdown(net);
}