Merge branch 'master' of ../mmc

[mv-sheeva.git] / drivers / isdn / i4l / isdn_net.c

diff --git a/drivers/isdn/i4l/isdn_net.c b/drivers/isdn/i4l/isdn_net.c
index 4da81c1325894a7613946df1e224f0cb54c707ad..023ea11d2f9e399dfb5161e27721f3104a8d204d 100644 (file)
--- a/drivers/isdn/i4l/isdn_net.c
+++ b/drivers/isdn/i4l/isdn_net.c
@@ -120,7 +120,7 @@ static __inline__ int isdn_net_device_busy(isdn_net_local *lp)
                return 0;
 
        if (lp->master)
-               nd = ((isdn_net_local *) lp->master->priv)->netdev;
+               nd = ISDN_MASTER_PRIV(lp)->netdev;
        else
                nd = lp->netdev;
        
@@ -213,9 +213,9 @@ isdn_net_reset(struct net_device *dev)
 {
 #ifdef CONFIG_ISDN_X25
        struct concap_device_ops * dops =
-               ( (isdn_net_local *) dev->priv ) -> dops;
+               ((isdn_net_local *) netdev_priv(dev))->dops;
        struct concap_proto * cprot =
-               ( (isdn_net_local *) dev->priv ) -> netdev -> cprot;
+               ((isdn_net_local *) netdev_priv(dev))->netdev->cprot;
 #endif
 #ifdef CONFIG_ISDN_X25
        if( cprot && cprot -> pops && dops )
@@ -250,11 +250,11 @@ isdn_net_open(struct net_device *dev)
        }
 
        /* If this interface has slaves, start them also */
-
-       if ((p = (((isdn_net_local *) dev->priv)->slave))) {
+       p = MASTER_TO_SLAVE(dev);
+       if (p) {
                while (p) {
                        isdn_net_reset(p);
-                       p = (((isdn_net_local *) p->priv)->slave);
+                       p = MASTER_TO_SLAVE(p);
                }
        }
        isdn_lock_drivers();
@@ -483,7 +483,7 @@ isdn_net_stat_callback(int idx, isdn_ctrl *c)
                                                        isdn_net_ciscohdlck_connected(lp);
                                                if (lp->p_encap != ISDN_NET_ENCAP_SYNCPPP) {
                                                        if (lp->master) { /* is lp a slave? */
-                                                               isdn_net_dev *nd = ((isdn_net_local *)lp->master->priv)->netdev;
+                                                               isdn_net_dev *nd = ISDN_MASTER_PRIV(lp)->netdev;
                                                                isdn_net_add_to_bundle(nd, lp);
                                                        }
                                                }
@@ -823,7 +823,7 @@ isdn_net_dial(void)
 void
 isdn_net_hangup(struct net_device *d)
 {
-       isdn_net_local *lp = (isdn_net_local *) d->priv;
+       isdn_net_local *lp = (isdn_net_local *) netdev_priv(d);
        isdn_ctrl cmd;
 #ifdef CONFIG_ISDN_X25
        struct concap_proto *cprot = lp->netdev->cprot;
@@ -832,7 +832,7 @@ isdn_net_hangup(struct net_device *d)
 
        if (lp->flags & ISDN_NET_CONNECTED) {
                if (lp->slave != NULL) {
-                       isdn_net_local *slp = (isdn_net_local *)lp->slave->priv;
+                       isdn_net_local *slp = ISDN_SLAVE_PRIV(lp);
                        if (slp->flags & ISDN_NET_CONNECTED) {
                                printk(KERN_INFO
                                        "isdn_net: hang up slave %s before %s\n",
@@ -1048,10 +1048,10 @@ isdn_net_xmit(struct net_device *ndev, struct sk_buff *skb)
 {
        isdn_net_dev *nd;
        isdn_net_local *slp;
-       isdn_net_local *lp = (isdn_net_local *) ndev->priv;
+       isdn_net_local *lp = (isdn_net_local *) netdev_priv(ndev);
        int retv = 0;
 
-       if (((isdn_net_local *) (ndev->priv))->master) {
+       if (((isdn_net_local *) netdev_priv(ndev))->master) {
                printk("isdn BUG at %s:%d!\n", __FILE__, __LINE__);
                dev_kfree_skb(skb);
                return 0;
@@ -1063,7 +1063,7 @@ isdn_net_xmit(struct net_device *ndev, struct sk_buff *skb)
                return isdn_ppp_xmit(skb, ndev);
        }
 #endif
-       nd = ((isdn_net_local *) ndev->priv)->netdev;
+       nd = ((isdn_net_local *) netdev_priv(ndev))->netdev;
        lp = isdn_net_get_locked_lp(nd);
        if (!lp) {
                printk(KERN_WARNING "%s: all channels busy - requeuing!\n", ndev->name);
@@ -1090,9 +1090,9 @@ isdn_net_xmit(struct net_device *ndev, struct sk_buff *skb)
                        } else {
                                /* subsequent overload: if slavedelay exceeded, start dialing */
                                if (time_after(jiffies, lp->sqfull_stamp + lp->slavedelay)) {
-                                       slp = lp->slave->priv;
+                                       slp = ISDN_SLAVE_PRIV(lp);
                                        if (!(slp->flags & ISDN_NET_CONNECTED)) {
-                                               isdn_net_force_dial_lp((isdn_net_local *) lp->slave->priv);
+                                               isdn_net_force_dial_lp(ISDN_SLAVE_PRIV(lp));
                                        }
                                }
                        }
@@ -1112,7 +1112,7 @@ isdn_net_xmit(struct net_device *ndev, struct sk_buff *skb)
 static void
 isdn_net_adjust_hdr(struct sk_buff *skb, struct net_device *dev)
 {
-       isdn_net_local *lp = (isdn_net_local *) dev->priv;
+       isdn_net_local *lp = (isdn_net_local *) netdev_priv(dev);
        if (!skb)
                return;
        if (lp->p_encap == ISDN_NET_ENCAP_ETHER) {
@@ -1127,7 +1127,7 @@ isdn_net_adjust_hdr(struct sk_buff *skb, struct net_device *dev)
 
 static void isdn_net_tx_timeout(struct net_device * ndev)
 {
-       isdn_net_local *lp = (isdn_net_local *) ndev->priv;
+       isdn_net_local *lp = (isdn_net_local *) netdev_priv(ndev);
 
        printk(KERN_WARNING "isdn_tx_timeout dev %s dialstate %d\n", ndev->name, lp->dialstate);
        if (!lp->dialstate){
@@ -1161,7 +1161,7 @@ static void isdn_net_tx_timeout(struct net_device * ndev)
 static int
 isdn_net_start_xmit(struct sk_buff *skb, struct net_device *ndev)
 {
-       isdn_net_local *lp = (isdn_net_local *) ndev->priv;
+       isdn_net_local *lp = (isdn_net_local *) netdev_priv(ndev);
 #ifdef CONFIG_ISDN_X25
        struct concap_proto * cprot = lp -> netdev -> cprot;
 /* At this point hard_start_xmit() passes control to the encapsulation
@@ -1310,7 +1310,7 @@ isdn_net_close(struct net_device *dev)
        struct net_device *p;
 #ifdef CONFIG_ISDN_X25
        struct concap_proto * cprot =
-               ( (isdn_net_local *) dev->priv ) -> netdev -> cprot;
+               ((isdn_net_local *) netdev_priv(dev))->netdev->cprot;
        /* printk(KERN_DEBUG "isdn_net_close %s\n" , dev-> name ); */
 #endif
 
@@ -1318,17 +1318,18 @@ isdn_net_close(struct net_device *dev)
        if( cprot && cprot -> pops ) cprot -> pops -> close( cprot );
 #endif
        netif_stop_queue(dev);
-       if ((p = (((isdn_net_local *) dev->priv)->slave))) {
+       p = MASTER_TO_SLAVE(dev);
+       if (p) {
                /* If this interface has slaves, stop them also */
                while (p) {
 #ifdef CONFIG_ISDN_X25
-                       cprot = ( (isdn_net_local *) p->priv )
+                       cprot = ((isdn_net_local *) netdev_priv(p))
                                -> netdev -> cprot;
                        if( cprot && cprot -> pops )
                                cprot -> pops -> close( cprot );
 #endif
                        isdn_net_hangup(p);
-                       p = (((isdn_net_local *) p->priv)->slave);
+                       p = MASTER_TO_SLAVE(p);
                }
        }
        isdn_net_hangup(dev);
@@ -1342,7 +1343,7 @@ isdn_net_close(struct net_device *dev)
 static struct net_device_stats *
 isdn_net_get_stats(struct net_device *dev)
 {
-       isdn_net_local *lp = (isdn_net_local *) dev->priv;
+       isdn_net_local *lp = (isdn_net_local *) netdev_priv(dev);
        return &lp->stats;
 }
 
@@ -1421,7 +1422,7 @@ isdn_net_ciscohdlck_alloc_skb(isdn_net_local *lp, int len)
 static int
 isdn_ciscohdlck_dev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 {
-       isdn_net_local *lp = (isdn_net_local *) dev->priv;
+       isdn_net_local *lp = (isdn_net_local *) netdev_priv(dev);
        unsigned long len = 0;
        unsigned long expires = 0;
        int tmp = 0;
@@ -1763,7 +1764,7 @@ isdn_net_ciscohdlck_receive(isdn_net_local *lp, struct sk_buff *skb)
 static void
 isdn_net_receive(struct net_device *ndev, struct sk_buff *skb)
 {
-       isdn_net_local *lp = (isdn_net_local *) ndev->priv;
+       isdn_net_local *lp = (isdn_net_local *) netdev_priv(ndev);
        isdn_net_local *olp = lp;       /* original 'lp' */
 #ifdef CONFIG_ISDN_X25
        struct concap_proto *cprot = lp -> netdev -> cprot;
@@ -1777,7 +1778,7 @@ isdn_net_receive(struct net_device *ndev, struct sk_buff *skb)
                 * handle master's statistics and hangup-timeout
                 */
                ndev = lp->master;
-               lp = (isdn_net_local *) ndev->priv;
+               lp = (isdn_net_local *) netdev_priv(ndev);
                lp->stats.rx_packets++;
                lp->stats.rx_bytes += skb->len;
        }
@@ -1878,7 +1879,7 @@ static int isdn_net_header(struct sk_buff *skb, struct net_device *dev,
                           unsigned short type,
                           const void *daddr, const void *saddr, unsigned plen)
 {
-       isdn_net_local *lp = dev->priv;
+       isdn_net_local *lp = netdev_priv(dev);
        unsigned char *p;
        ushort len = 0;
 
@@ -1935,7 +1936,7 @@ static int
 isdn_net_rebuild_header(struct sk_buff *skb)
 {
        struct net_device *dev = skb->dev;
-       isdn_net_local *lp = dev->priv;
+       isdn_net_local *lp = netdev_priv(dev);
        int ret = 0;
 
        if (lp->p_encap == ISDN_NET_ENCAP_ETHER) {
@@ -1965,7 +1966,7 @@ isdn_net_rebuild_header(struct sk_buff *skb)
 static int isdn_header_cache(const struct neighbour *neigh, struct hh_cache *hh)
 {
        const struct net_device *dev = neigh->dev;
-       isdn_net_local *lp = dev->priv;
+       isdn_net_local *lp = netdev_priv(dev);
 
        if (lp->p_encap == ISDN_NET_ENCAP_ETHER)
                return eth_header_cache(neigh, hh);
@@ -1976,7 +1977,7 @@ static void isdn_header_cache_update(struct hh_cache *hh,
                                     const struct net_device *dev,
                                     const unsigned char *haddr)
 {
-       isdn_net_local *lp = dev->priv;
+       isdn_net_local *lp = netdev_priv(dev);
        if (lp->p_encap == ISDN_NET_ENCAP_ETHER)
                eth_header_cache_update(hh, dev, haddr);
 }
@@ -2291,16 +2292,16 @@ isdn_net_find_icall(int di, int ch, int idx, setup_parm *setup)
                                 * it's master and parent slave is online. If not, reject the call.
                                 */
                                if (lp->master) {
-                                       isdn_net_local *mlp = (isdn_net_local *) lp->master->priv;
+                                       isdn_net_local *mlp = ISDN_MASTER_PRIV(lp);
                                        printk(KERN_DEBUG "ICALLslv: %s\n", p->dev->name);
                                        printk(KERN_DEBUG "master=%s\n", lp->master->name);
                                        if (mlp->flags & ISDN_NET_CONNECTED) {
                                                printk(KERN_DEBUG "master online\n");
                                                /* Master is online, find parent-slave (master if first slave) */
                                                while (mlp->slave) {
-                                                       if ((isdn_net_local *) mlp->slave->priv == lp)
+                                                       if (ISDN_SLAVE_PRIV(mlp) == lp)
                                                                break;
-                                                       mlp = (isdn_net_local *) mlp->slave->priv;
+                                                       mlp = ISDN_SLAVE_PRIV(mlp);
                                                }
                                        } else
                                                printk(KERN_DEBUG "master offline\n");
@@ -2512,7 +2513,7 @@ isdn_net_force_dial(char *name)
  */
 static void _isdn_setup(struct net_device *dev)
 {
-       isdn_net_local *lp = dev->priv;
+       isdn_net_local *lp = netdev_priv(dev);
 
        dev->flags = IFF_NOARP | IFF_POINTOPOINT;
        lp->p_encap = ISDN_NET_ENCAP_RAWIP;
@@ -2568,20 +2569,20 @@ isdn_net_new(char *name, struct net_device *master)
                kfree(netdev);
                return NULL;
        }
-       netdev->local = netdev->dev->priv;
+       netdev->local = netdev_priv(netdev->dev);
        netdev->dev->init = isdn_net_init;
        if (master) {
                /* Device shall be a slave */
-               struct net_device *p = (((isdn_net_local *) master->priv)->slave);
+               struct net_device *p = MASTER_TO_SLAVE(master);
                struct net_device *q = master;
 
                netdev->local->master = master;
                /* Put device at end of slave-chain */
                while (p) {
                        q = p;
-                       p = (((isdn_net_local *) p->priv)->slave);
+                       p = MASTER_TO_SLAVE(p);
                }
-               ((isdn_net_local *) q->priv)->slave = netdev->dev;
+               MASTER_TO_SLAVE(q) = netdev->dev;
        } else {
                /* Device shall be a master */
                /*
@@ -3079,7 +3080,7 @@ isdn_net_force_hangup(char *name)
                /* If this interface has slaves, do a hangup for them also. */
                while (q) {
                        isdn_net_hangup(q);
-                       q = (((isdn_net_local *) q->priv)->slave);
+                       q = MASTER_TO_SLAVE(q);
                }
                isdn_net_hangup(p->dev);
                return 0;
@@ -3109,8 +3110,10 @@ isdn_net_realrm(isdn_net_dev * p, isdn_net_dev * q)
                isdn_unexclusive_channel(p->local->pre_device, p->local->pre_channel);
        if (p->local->master) {
                /* It's a slave-device, so update master's slave-pointer if necessary */
-               if (((isdn_net_local *) (p->local->master->priv))->slave == p->dev)
-                       ((isdn_net_local *) (p->local->master->priv))->slave = p->local->slave;
+               if (((isdn_net_local *) ISDN_MASTER_PRIV(p->local))->slave ==
+                   p->dev)
+                       ((isdn_net_local *)ISDN_MASTER_PRIV(p->local))->slave =
+                               p->local->slave;
        } else {
                /* Unregister only if it's a master-device */
                unregister_netdev(p->dev);