- correcting some AUTO-merge faults

This commit is contained in:
Marian Ohligs 2011-08-02 13:13:04 +02:00
parent 0aac6cf2be
commit b744c01dc0

View file

@ -169,10 +169,11 @@ int network_shutdown(void)
#elif defined(CONFIG_PCI)
dhcp_release(default_netif);
dhcp_stop(default_netif);
#endif
mem_free(default_netif);
default_netif = NULL;
#endif
return 0;
}