diff --git a/[refs] b/[refs]
index 8069dc9fbcaa..057b62aa0298 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c02373bf2759dd210dc8c72c9c9b4a8f1c279cac
+refs/heads/master: 8dfcdf342d9e8294a3292005f9158022289dfd67
diff --git a/trunk/drivers/net/ifb.c b/trunk/drivers/net/ifb.c
index e4fbefc8c82f..363a166df8fb 100644
--- a/trunk/drivers/net/ifb.c
+++ b/trunk/drivers/net/ifb.c
@@ -137,18 +137,23 @@ static void ri_tasklet(unsigned long dev)
 
 }
 
+static const struct net_device_ops ifb_netdev_ops = {
+	.ndo_validate_addr = eth_validate_addr,
+	.ndo_open	= ifb_open,
+	.ndo_stop	= ifb_close,
+};
+
 static void ifb_setup(struct net_device *dev)
 {
 	/* Initialize the device structure. */
 	dev->hard_start_xmit = ifb_xmit;
-	dev->open = &ifb_open;
-	dev->stop = &ifb_close;
 	dev->destructor = free_netdev;
+	dev->netdev_ops = &ifb_netdev_ops;
 
 	/* Fill in device structure with ethernet-generic values. */
 	ether_setup(dev);
 	dev->tx_queue_len = TX_Q_LIMIT;
-	dev->change_mtu = NULL;
+
 	dev->flags |= IFF_NOARP;
 	dev->flags &= ~IFF_MULTICAST;
 	random_ether_addr(dev->dev_addr);