Merge branch 'fix/hda' into for-linus

[pandora-kernel.git] / net / ipv6 / sit.c

diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
index b7a50e9..d3467e5 100644 (file)
--- a/net/ipv6/sit.c
+++ b/net/ipv6/sit.c
@@ -62,8 +62,8 @@
 #define HASH_SIZE  16
 #define HASH(addr) (((__force u32)addr^((__force u32)addr>>4))&0xF)
 
-static int ipip6_fb_tunnel_init(struct net_device *dev);
-static int ipip6_tunnel_init(struct net_device *dev);
+static void ipip6_fb_tunnel_init(struct net_device *dev);
+static void ipip6_tunnel_init(struct net_device *dev);
 static void ipip6_tunnel_setup(struct net_device *dev);
 
 static int sit_net_id;
@@ -188,7 +188,8 @@ static struct ip_tunnel * ipip6_tunnel_locate(struct net *net,
        }
 
        nt = netdev_priv(dev);
-       dev->init = ipip6_tunnel_init;
+       ipip6_tunnel_init(dev);
+
        nt->parms = *parms;
 
        if (parms->i_flags & SIT_ISATAP)
@@ -926,13 +927,17 @@ static int ipip6_tunnel_change_mtu(struct net_device *dev, int new_mtu)
        return 0;
 }
 
+static const struct net_device_ops ipip6_netdev_ops = {
+       .ndo_uninit     = ipip6_tunnel_uninit,
+       .ndo_start_xmit = ipip6_tunnel_xmit,
+       .ndo_do_ioctl   = ipip6_tunnel_ioctl,
+       .ndo_change_mtu = ipip6_tunnel_change_mtu,
+};
+
 static void ipip6_tunnel_setup(struct net_device *dev)
 {
-       dev->uninit             = ipip6_tunnel_uninit;
+       dev->netdev_ops         = &ipip6_netdev_ops;
        dev->destructor         = free_netdev;
-       dev->hard_start_xmit    = ipip6_tunnel_xmit;
-       dev->do_ioctl           = ipip6_tunnel_ioctl;
-       dev->change_mtu         = ipip6_tunnel_change_mtu;
 
        dev->type               = ARPHRD_SIT;
        dev->hard_header_len    = LL_MAX_HEADER + sizeof(struct iphdr);
@@ -943,11 +948,9 @@ static void ipip6_tunnel_setup(struct net_device *dev)
        dev->features           |= NETIF_F_NETNS_LOCAL;
 }
 
-static int ipip6_tunnel_init(struct net_device *dev)
+static void ipip6_tunnel_init(struct net_device *dev)
 {
-       struct ip_tunnel *tunnel;
-
-       tunnel = netdev_priv(dev);
+       struct ip_tunnel *tunnel = netdev_priv(dev);
 
        tunnel->dev = dev;
        strcpy(tunnel->parms.name, dev->name);
@@ -956,11 +959,9 @@ static int ipip6_tunnel_init(struct net_device *dev)
        memcpy(dev->broadcast, &tunnel->parms.iph.daddr, 4);
 
        ipip6_tunnel_bind_dev(dev);
-
-       return 0;
 }
 
-static int ipip6_fb_tunnel_init(struct net_device *dev)
+static void ipip6_fb_tunnel_init(struct net_device *dev)
 {
        struct ip_tunnel *tunnel = netdev_priv(dev);
        struct iphdr *iph = &tunnel->parms.iph;
@@ -977,7 +978,6 @@ static int ipip6_fb_tunnel_init(struct net_device *dev)
 
        dev_hold(dev);
        sitn->tunnels_wc[0]     = tunnel;
-       return 0;
 }
 
 static struct xfrm_tunnel sit_handler = {
@@ -1025,16 +1025,17 @@ static int sit_init_net(struct net *net)
                err = -ENOMEM;
                goto err_alloc_dev;
        }
-
-       sitn->fb_tunnel_dev->init = ipip6_fb_tunnel_init;
        dev_net_set(sitn->fb_tunnel_dev, net);
 
+       ipip6_fb_tunnel_init(sitn->fb_tunnel_dev);
+
        if ((err = register_netdev(sitn->fb_tunnel_dev)))
                goto err_reg_dev;
 
        return 0;
 
 err_reg_dev:
+       dev_put(sitn->fb_tunnel_dev);
        free_netdev(sitn->fb_tunnel_dev);
 err_alloc_dev:
        /* nothing */