From aec9b8a41b6cad1b257c4e3a7f043f35871aafd0 Mon Sep 17 00:00:00 2001
From: Michael Brown
Date: Fri, 21 Mar 2008 00:01:27 +0000
Subject: [Settings] Use a settings applicator to configure IPv4 routes.

---
 src/include/gpxe/dhcp.h      |  3 ---
 src/include/gpxe/ip.h        |  5 -----
 src/include/gpxe/netdevice.h | 11 +++++++++++
 3 files changed, 11 insertions(+), 8 deletions(-)

(limited to 'src/include')

diff --git a/src/include/gpxe/dhcp.h b/src/include/gpxe/dhcp.h
index a8fa811f7..de10cc980 100644
--- a/src/include/gpxe/dhcp.h
+++ b/src/include/gpxe/dhcp.h
@@ -557,7 +557,4 @@ extern int create_dhcp_response ( struct net_device *netdev, int msgtype,
 extern int start_dhcp ( struct job_interface *job, struct net_device *netdev,
 			int (*register_options) ( struct net_device *,
 						  struct dhcp_option_block * ));
-extern int dhcp_configure_netdev ( struct net_device *netdev,
-				   struct dhcp_option_block *options );
-
 #endif /* _GPXE_DHCP_H */
diff --git a/src/include/gpxe/ip.h b/src/include/gpxe/ip.h
index a68440930..0a23565b2 100644
--- a/src/include/gpxe/ip.h
+++ b/src/include/gpxe/ip.h
@@ -77,9 +77,4 @@ extern struct list_head ipv4_miniroutes;
 
 extern struct net_protocol ipv4_protocol;
 
-extern int add_ipv4_address ( struct net_device *netdev,
-			      struct in_addr address, struct in_addr netmask,
-			      struct in_addr gateway );
-extern void del_ipv4_address ( struct net_device *netdev );
-
 #endif /* _GPXE_IP_H */
diff --git a/src/include/gpxe/netdevice.h b/src/include/gpxe/netdevice.h
index 6f5c06f93..4abada7aa 100644
--- a/src/include/gpxe/netdevice.h
+++ b/src/include/gpxe/netdevice.h
@@ -341,6 +341,17 @@ netdev_priv ( struct net_device *netdev ) {
         return netdev->priv;
 }
 
+/**
+ * Get per-netdevice configuration settings block
+ *
+ * @v netdev		Network device
+ * @ret settings	Settings block
+ */
+static inline __attribute__ (( always_inline )) struct settings *
+netdev_settings ( struct net_device *netdev ) {
+	return &netdev->settings;
+}
+
 extern int netdev_tx ( struct net_device *netdev, struct io_buffer *iobuf );
 extern void netdev_tx_complete_err ( struct net_device *netdev,
 				 struct io_buffer *iobuf, int rc );
-- 
cgit v1.2.3-55-g7522