2 files changed, 16 insertions, 7 deletions

diff --git a/src/net/netdev_settings.c b/src/net/netdev_settings.c
index 54ce2fbce..b9220f5ea 100644
--- a/src/net/netdev_settings.c
+++ b/src/net/netdev_settings.c
@@ -56,9 +56,9 @@ static int netdev_store ( struct settings *settings, struct setting *setting,
 			return -EINVAL;
 		memcpy ( netdev->ll_addr, data, len );
 		return 0;
-	} else {
-		return simple_settings_store ( settings, setting, data, len );
 	}
+
+	return generic_settings_store ( settings, setting, data, len );
 }
 
 /**
@@ -80,13 +80,23 @@ static int netdev_fetch ( struct settings *settings, struct setting *setting,
 			len = netdev->ll_protocol->ll_addr_len;
 		memcpy ( data, netdev->ll_addr, len );
 		return netdev->ll_protocol->ll_addr_len;
-	} else {
-		return simple_settings_fetch ( settings, setting, data, len );
 	}
+
+	return generic_settings_fetch ( settings, setting, data, len );
+}
+
+/**
+ * Clear network device settings
+ *
+ * @v settings		Settings block
+ */
+static void netdev_clear ( struct settings *settings ) {
+	generic_settings_clear ( settings );
 }
 
 /** Network device configuration settings operations */
 struct settings_operations netdev_settings_operations = {
 	.store = netdev_store,
 	.fetch = netdev_fetch,
+	.clear = netdev_clear,
 };
diff --git a/src/net/netdevice.c b/src/net/netdevice.c
index 1a68af2c4..77edbcd37 100644
--- a/src/net/netdevice.c
+++ b/src/net/netdevice.c
@@ -282,6 +282,7 @@ static void free_netdev ( struct refcnt *refcnt ) {
 	
 	netdev_tx_flush ( netdev );
 	netdev_rx_flush ( netdev );
+	clear_settings ( netdev_settings ( netdev ) );
 	free ( netdev );
 }
 
@@ -303,9 +304,7 @@ struct net_device * alloc_netdev ( size_t priv_size ) {
 		netdev->refcnt.free = free_netdev;
 		INIT_LIST_HEAD ( &netdev->tx_queue );
 		INIT_LIST_HEAD ( &netdev->rx_queue );
-		settings_init ( netdev_settings ( netdev ),
-				&netdev_settings_operations, &netdev->refcnt,
-				netdev->name, 0 );
+		netdev_settings_init ( netdev );
 		netdev->priv = ( ( ( void * ) netdev ) + sizeof ( *netdev ) );
 	}
 	return netdev;