diff options
| author | Chris Lumens <clumens@redhat.com> | 2009-02-13 10:31:12 -0500 |
|---|---|---|
| committer | Chris Lumens <clumens@redhat.com> | 2009-02-13 10:31:12 -0500 |
| commit | a09d92aa972ffb9ff63fe3efa602c7482cc749c8 (patch) | |
| tree | 8be1c7e9f68ad0b2a01a08e797eeb43f9d64c473 /loader | |
| parent | f043c5081a13f8fd63e850226b73b033b5e72e9e (diff) | |
Fix build errors in the new net.c code.
Diffstat (limited to 'loader')
| -rw-r--r-- | loader/net.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/loader/net.c b/loader/net.c index e43b88c12..84ddd7a6d 100644 --- a/loader/net.c +++ b/loader/net.c @@ -239,8 +239,8 @@ void setupIfaceStruct(iface_t * iface, struct loaderData_s * loaderData) { if (loaderData->ipinfo_set && loaderData->ipv4 != NULL) { /* this is iBFT configured device */ - if (!strncmp(loaderData->ip, "ibft", 4)) { - char *devmacaddr = nl_mac2str(loaderData->netDev); + if (!strncmp(loaderData->ipv4, "ibft", 4)) { + char *devmacaddr = iface_mac2str(loaderData->netDev); iface->ipv4method = IPV4_IBFT_METHOD; iface->isiBFT = 1; @@ -1272,9 +1272,9 @@ int writeEnabledNetInfo(iface_t *iface) { if(ibft_iface_ip()) fprintf(fp, "IPADDR=%s\n", ibft_iface_ip()); if(ibft_iface_mask()) fprintf(fp, "NETMASK=%s\n", ibft_iface_mask()); if(ibft_iface_gw()) fprintf(fp, "GATEWAY=%s\n", ibft_iface_gw()); - else if (iface->ipv4method == IPV4_IBFT_DHCP_METHOD) { + } else if (iface->ipv4method == IPV4_IBFT_DHCP_METHOD) { fprintf(fp, "BOOTPROTO=dhcp\n"); - else if (iface->ipv4method == IPV4_DHCP_METHOD) { + } else if (iface->ipv4method == IPV4_DHCP_METHOD) { fprintf(fp, "BOOTPROTO=dhcp\n"); } else if (iface->ipv4method == IPV4_MANUAL_METHOD) { fprintf(fp, "BOOTPROTO=static\n"); @@ -1740,7 +1740,7 @@ int chooseNetworkInterface(struct loaderData_s * loaderData) { for (i = 0; devs[i]; i++) { if (!devs[i]->device) continue; - devmacaddr = nl_mac2str(devs[i]->device); + devmacaddr = iface_mac2str(devs[i]->device); if(!strcasecmp(devmacaddr, ibftmacaddr)){ logMessage(INFO, "%s has the right MAC (%s), checking for link", devmacaddr, devices[i]); free(devmacaddr); @@ -1750,8 +1750,8 @@ int chooseNetworkInterface(struct loaderData_s * loaderData) { logMessage(INFO, "%s has link, using it", devices[i]); /* set the IP method to ibft if not requested differently */ - if(loaderData->ip==NULL){ - loaderData->ip = strdup("ibft"); + if(loaderData->ipv4 == NULL){ + loaderData->ipv4 = strdup("ibft"); logMessage(INFO, "%s will be configured using iBFT values", devices[i]); } return LOADER_NOOP; |