diff options
| author | Michael Brown | 2006-07-20 04:51:52 +0200 |
|---|---|---|
| committer | Michael Brown | 2006-07-20 04:51:52 +0200 |
| commit | e74e20cb5599e646ec3f29e019a59fcce0b4ebb4 (patch) | |
| tree | ee69652c49448dadd14f34755b9004f68d9d8347 /src | |
| parent | Added dhcp_ipv4_option() and friends. (diff) | |
| download | ipxe-e74e20cb5599e646ec3f29e019a59fcce0b4ebb4.tar.gz ipxe-e74e20cb5599e646ec3f29e019a59fcce0b4ebb4.tar.xz ipxe-e74e20cb5599e646ec3f29e019a59fcce0b4ebb4.zip | |
Remove the static IP address hack from netdevice.c, and change the
default test to the DHCP test.
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/main.c | 2 | ||||
| -rw-r--r-- | src/net/netdevice.c | 20 |
2 files changed, 1 insertions, 21 deletions
diff --git a/src/core/main.c b/src/core/main.c index 2f76cc27d..0cc30f573 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -154,7 +154,7 @@ int main ( void ) { netdev = next_netdev (); if ( netdev ) { - test_aoeboot ( netdev ); + test_dhcp ( netdev ); } else { printf ( "No network device found\n" ); } diff --git a/src/net/netdevice.c b/src/net/netdevice.c index 1197e66cd..825613cc8 100644 --- a/src/net/netdevice.c +++ b/src/net/netdevice.c @@ -41,10 +41,6 @@ static struct net_protocol net_protocols_end[0] __table_end ( net_protocols ); /** List of network devices */ static LIST_HEAD ( net_devices ); -#warning "Remove this static IP address hack" -#include <ip.h> -#include <gpxe/ip.h> - /** * Transmit raw packet via network device * @@ -179,19 +175,6 @@ struct net_device * alloc_netdev ( size_t priv_size ) { */ int register_netdev ( struct net_device *netdev ) { -#warning "Remove this static IP address hack" - { - const struct in_addr static_address = { htonl ( 0x0afefe01 ) }; - const struct in_addr static_netmask = { htonl ( 0xffffff00 ) }; - const struct in_addr static_gateway = { INADDR_NONE }; - int rc; - - if ( ( rc = add_ipv4_address ( netdev, static_address, - static_netmask, - static_gateway ) ) != 0 ) - return rc; - } - /* Add to device list */ list_add_tail ( &netdev->list, &net_devices ); DBG ( "%s registered\n", netdev_name ( netdev ) ); @@ -209,9 +192,6 @@ int register_netdev ( struct net_device *netdev ) { void unregister_netdev ( struct net_device *netdev ) { struct pk_buff *pkb; -#warning "Remove this static IP address hack" - del_ipv4_address ( netdev ); - /* Discard any packets in the RX queue */ while ( ( pkb = netdev_rx_dequeue ( netdev ) ) ) { DBG ( "%s discarding %p+%zx\n", netdev_name ( netdev ), |