diff options
| author | Toomas Soome <tsoome@me.com> | 2019-08-16 13:20:23 +0300 |
|---|---|---|
| committer | Toomas Soome <tsoome@me.com> | 2019-08-19 00:06:37 +0300 |
| commit | 2052a1fb16201e50b4c3a91ebcbeeccbc8276644 (patch) | |
| tree | 93f521621dfab0f81ce7a122620263df23def052 | |
| parent | 8d94f651a44d41a7147253bb5dad1a53941e8f50 (diff) | |
| download | illumos-joyent-2052a1fb16201e50b4c3a91ebcbeeccbc8276644.tar.gz | |
11568 loader: pxe.c missing initializer
Reviewed by: C Fraire <cfraire@me.com>
Reviewed by: Rob Johnston <rob.johnston@joyent.com>
Approved by: Robert Mustacchi <rm@joyent.com>
| -rw-r--r-- | usr/src/boot/sys/boot/i386/libi386/pxe.c | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/usr/src/boot/sys/boot/i386/libi386/pxe.c b/usr/src/boot/sys/boot/i386/libi386/pxe.c index 693596559d..821d0f627d 100644 --- a/usr/src/boot/sys/boot/i386/libi386/pxe.c +++ b/usr/src/boot/sys/boot/i386/libi386/pxe.c @@ -76,16 +76,21 @@ static ssize_t pxe_netif_put(struct iodesc *desc, void *pkt, size_t len); static void pxe_netif_end(struct netif *nif); extern struct netif_stats pxe_st[]; -extern u_int16_t __bangpxeseg; -extern u_int16_t __bangpxeoff; +extern uint16_t __bangpxeseg; +extern uint16_t __bangpxeoff; extern void __bangpxeentry(void); -extern u_int16_t __pxenvseg; -extern u_int16_t __pxenvoff; +extern uint16_t __pxenvseg; +extern uint16_t __pxenvoff; extern void __pxenventry(void); struct netif_dif pxe_ifs[] = { -/* dif_unit dif_nsel dif_stats dif_private */ - {0, 1, &pxe_st[0], 0} + { + .dif_unit = 0, + .dif_nsel = 1, + .dif_stats = &pxe_st[0], + .dif_private = NULL, + .dif_used = 0 + } }; struct netif_stats pxe_st[nitems(pxe_ifs)]; @@ -218,7 +223,7 @@ pxe_init(void) pxenv_p->RMEntry.segment, pxenv_p->RMEntry.offset); } - gci_p = bio_alloc(sizeof(*gci_p)); + gci_p = bio_alloc(sizeof (*gci_p)); if (gci_p == NULL) { pxe_p = NULL; return (0); @@ -269,7 +274,7 @@ pxe_cleanup(void) if (pxe_call == NULL) return; - undi_shutdown_p = bio_alloc(sizeof(*undi_shutdown_p)); + undi_shutdown_p = bio_alloc(sizeof (*undi_shutdown_p)); if (undi_shutdown_p != NULL) { bzero(undi_shutdown_p, sizeof (*undi_shutdown_p)); pxe_call(PXENV_UNDI_SHUTDOWN, undi_shutdown_p); @@ -282,7 +287,7 @@ pxe_cleanup(void) bio_free(undi_shutdown_p, sizeof (*undi_shutdown_p)); } - unload_stack_p = bio_alloc(sizeof(*unload_stack_p)); + unload_stack_p = bio_alloc(sizeof (*unload_stack_p)); if (unload_stack_p != NULL) { bzero(unload_stack_p, sizeof (*unload_stack_p)); pxe_call(PXENV_UNLOAD_STACK, unload_stack_p); @@ -423,7 +428,7 @@ pxe_netif_init(struct iodesc *desc, void *machdep_hint) else desc->xid = 0; - bio_free(undi_info_p, sizeof(*undi_info_p)); + bio_free(undi_info_p, sizeof (*undi_info_p)); undi_open_p = bio_alloc(sizeof (*undi_open_p)); if (undi_open_p == NULL) return; |