vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Remove cards with no associated driver.

Browse source
This commit is contained in:
Manoel Rebelo Abranches 2011-05-10 09:54:32 -03:00
parent 0f231af8ae
commit 70c52f3e24
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
grub-core/net/drivers/ieee1275/ofnet.c
View file

@ -148,10 +148,12 @@ void grub_ofnet_findcards (void)
lla.type = GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET; lla.type = GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET;
card->default_address = lla; card->default_address = lla;
card->driver = NULL;
card->data = ofdata; card->data = ofdata;
card->flags = 0; card->flags = 0;
card->name = grub_xasprintf("eth%d",i++); // grub_strdup (alias->name); card->name = grub_xasprintf("eth%d",i++); // grub_strdup (alias->name);
grub_net_card_register (card); grub_net_card_register (card);
return 0;
} }
return 0; return 0;
} }
@ -192,19 +194,24 @@ void grub_ofnet_probecards (void)
net.ipv4.masksize = 24; net.ipv4.masksize = 24;
grub_net_add_route ("bootp-router", net, inter); grub_net_add_route ("bootp-router", net, inter);
} }
grub_free (bootp_pckt);
break; break;
} }
} }
} }
grub_free (bootp_pckt);
} }
GRUB_MOD_INIT (ofnet) GRUB_MOD_INIT (ofnet)
{ {
struct grub_net_card *card;
grub_getbootp = grub_getbootp_real; grub_getbootp = grub_getbootp_real;
grub_net_card_driver_register (&ofdriver); grub_net_card_driver_register (&ofdriver);
grub_ofnet_findcards (); grub_ofnet_findcards ();
grub_ofnet_probecards (); grub_ofnet_probecards ();
FOR_NET_CARDS (card)
if (card->driver == NULL)
grub_net_card_unregister (card);
} }
GRUB_MOD_FINI (ofnet) GRUB_MOD_FINI (ofnet)