Merge git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6

[sfrench/cifs-2.6.git] / arch / xtensa / platforms / iss / network.c

diff --git a/arch/xtensa/platforms/iss/network.c b/arch/xtensa/platforms/iss/network.c
index 87f47cade013549d90b8966326f1134a52957fca..edad4156d89a2ba30702bfda4f1b3c60dbad14dc 100644 (file)
--- a/arch/xtensa/platforms/iss/network.c
+++ b/arch/xtensa/platforms/iss/network.c
@@ -1,6 +1,6 @@
 /*
  *
- * arch/xtensa/platform-iss/network.c
+ * arch/xtensa/platforms/iss/network.c
  *
  * Platform specific initialization.
  *
@@ -33,7 +33,7 @@
 #include <linux/rtnetlink.h>
 #include <linux/platform_device.h>
 
-#include <asm/platform/simcall.h>
+#include <platform/simcall.h>
 
 #define DRIVER_NAME "iss-netdev"
 #define ETH_MAX_PACKET 1500
@@ -365,7 +365,7 @@ static int tuntap_probe(struct iss_net_private *lp, int index, char *init)
 
 static int iss_net_rx(struct net_device *dev)
 {
-       struct iss_net_private *lp = dev->priv;
+       struct iss_net_private *lp = netdev_priv(dev);
        int pkt_len;
        struct sk_buff *skb;
 
@@ -456,7 +456,7 @@ static void iss_net_timer(unsigned long priv)
 
 static int iss_net_open(struct net_device *dev)
 {
-       struct iss_net_private *lp = dev->priv;
+       struct iss_net_private *lp = netdev_priv(dev);
        char addr[sizeof "255.255.255.255\0"];
        int err;
 
@@ -496,7 +496,7 @@ out:
 
 static int iss_net_close(struct net_device *dev)
 {
-       struct iss_net_private *lp = dev->priv;
+       struct iss_net_private *lp = netdev_priv(dev);
 printk("iss_net_close!\n");
        netif_stop_queue(dev);
        spin_lock(&lp->lock);
@@ -515,7 +515,7 @@ printk("iss_net_close!\n");
 
 static int iss_net_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
-       struct iss_net_private *lp = dev->priv;
+       struct iss_net_private *lp = netdev_priv(dev);
        unsigned long flags;
        int len;
 
@@ -551,7 +551,7 @@ static int iss_net_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
 static struct net_device_stats *iss_net_get_stats(struct net_device *dev)
 {
-       struct iss_net_private *lp = dev->priv;
+       struct iss_net_private *lp = netdev_priv(dev);
        return &lp->stats;
 }
 
@@ -578,7 +578,7 @@ static void iss_net_tx_timeout(struct net_device *dev)
 static int iss_net_set_mac(struct net_device *dev, void *addr)
 {
 #if 0
-       struct iss_net_private *lp = dev->priv;
+       struct iss_net_private *lp = netdev_priv(dev);
        struct sockaddr *hwaddr = addr;
 
        spin_lock(&lp->lock);
@@ -592,7 +592,7 @@ static int iss_net_set_mac(struct net_device *dev, void *addr)
 static int iss_net_change_mtu(struct net_device *dev, int new_mtu)
 {
 #if 0
-       struct iss_net_private *lp = dev->priv;
+       struct iss_net_private *lp = netdev_priv(dev);
        int err = 0;
 
        spin_lock(&lp->lock);
@@ -636,7 +636,7 @@ static int iss_net_configure(int index, char *init)
 
        /* Initialize private element. */
 
-       lp = dev->priv;
+       lp = netdev_priv(dev);
        *lp = ((struct iss_net_private) {
                .device_list            = LIST_HEAD_INIT(lp->device_list),
                .opened_list            = LIST_HEAD_INIT(lp->opened_list),