Merge branch 'fix/misc' into for-linus

[pandora-kernel.git] / arch / um / drivers / slirp_kern.c

diff --git a/arch/um/drivers/slirp_kern.c b/arch/um/drivers/slirp_kern.c
index 240ee65..e376284 100644 (file)
--- a/arch/um/drivers/slirp_kern.c
+++ b/arch/um/drivers/slirp_kern.c
@@ -22,7 +22,7 @@ void slirp_init(struct net_device *dev, void *data)
        struct slirp_init *init = data;
        int i;
 
-       private = dev->priv;
+       private = netdev_priv(dev);
        spri = (struct slirp_data *) private->user;
 
        spri->argw = init->argw;
@@ -32,11 +32,8 @@ void slirp_init(struct net_device *dev, void *data)
 
        slip_proto_init(&spri->slip);
 
-       dev->init = NULL;
        dev->hard_header_len = 0;
-       dev->header_cache_update = NULL;
-       dev->hard_header_cache = NULL;
-       dev->hard_header = NULL;
+       dev->header_ops = NULL;
        dev->addr_len = 0;
        dev->type = ARPHRD_SLIP;
        dev->tx_queue_len = 256;