Merge branch 'master' of ../mmc

[pandora-kernel.git] / arch / ia64 / hp / sim / simeth.c

diff --git a/arch/ia64/hp/sim/simeth.c b/arch/ia64/hp/sim/simeth.c
index 969fe9f..e4d8fde 100644 (file)
--- a/arch/ia64/hp/sim/simeth.c
+++ b/arch/ia64/hp/sim/simeth.c
@@ -167,6 +167,15 @@ netdev_read(int fd, unsigned char *buf, unsigned int len)
        return ia64_ssc(fd, __pa(buf), len, 0, SSC_NETDEV_RECV);
 }
 
+static const struct net_device_ops simeth_netdev_ops = {
+       .ndo_open               = simeth_open,
+       .ndo_stop               = simeth_close,
+       .ndo_start_xmit         = simeth_tx,
+       .ndo_get_stats          = simeth_get_stats,
+       .ndo_set_multicast_list = set_multicast_list, /* not yet used */
+
+};
+
 /*
  * Function shared with module code, so cannot be in init section
  *
@@ -206,14 +215,10 @@ simeth_probe1(void)
 
        memcpy(dev->dev_addr, mac_addr, sizeof(mac_addr));
 
-       local = dev->priv;
+       local = netdev_priv(dev);
        local->simfd = fd; /* keep track of underlying file descriptor */
 
-       dev->open               = simeth_open;
-       dev->stop               = simeth_close;
-       dev->hard_start_xmit    = simeth_tx;
-       dev->get_stats          = simeth_get_stats;
-       dev->set_multicast_list = set_multicast_list; /* no yet used */
+       dev->netdev_ops = &simeth_netdev_ops;
 
        err = register_netdev(dev);
        if (err) {
@@ -294,7 +299,7 @@ simeth_device_event(struct notifier_block *this,unsigned long event, void *ptr)
                return NOTIFY_DONE;
        }
 
-       if (dev->nd_net != &init_net)
+       if (dev_net(dev) != &init_net)
                return NOTIFY_DONE;
 
        if ( event != NETDEV_UP && event != NETDEV_DOWN ) return NOTIFY_DONE;
@@ -325,7 +330,7 @@ simeth_device_event(struct notifier_block *this,unsigned long event, void *ptr)
         * we get DOWN then UP.
         */
 
-       local = dev->priv;
+       local = netdev_priv(dev);
        /* now do it for real */
        r = event == NETDEV_UP ?
                netdev_attach(local->simfd, dev->irq, ntohl(ifa->ifa_local)):
@@ -380,7 +385,7 @@ frame_print(unsigned char *from, unsigned char *frame, int len)
 static int
 simeth_tx(struct sk_buff *skb, struct net_device *dev)
 {
-       struct simeth_local *local = dev->priv;
+       struct simeth_local *local = netdev_priv(dev);
 
 #if 0
        /* ensure we have at least ETH_ZLEN bytes (min frame size) */
@@ -443,7 +448,7 @@ simeth_rx(struct net_device *dev)
        int                     len;
        int                     rcv_count = SIMETH_RECV_MAX;
 
-       local = dev->priv;
+       local = netdev_priv(dev);
        /*
         * the loop concept has been borrowed from other drivers
         * looks to me like it's a throttling thing to avoid pushing to many
@@ -507,7 +512,7 @@ simeth_interrupt(int irq, void *dev_id)
 static struct net_device_stats *
 simeth_get_stats(struct net_device *dev)
 {
-       struct simeth_local *local = dev->priv;
+       struct simeth_local *local = netdev_priv(dev);
 
        return &local->stats;
 }