12 files changed, 194 insertions, 95 deletions

diff --git a/net/atm/atm_sysfs.c b/net/atm/atm_sysfs.c
index 1b88311f2130..b5674dc2083d 100644
--- a/net/atm/atm_sysfs.c
+++ b/net/atm/atm_sysfs.c
@@ -149,7 +149,7 @@ int atm_register_sysfs(struct atm_dev *adev)
         cdev->class = &atm_class;
         dev_set_drvdata(cdev, adev);
 
-        snprintf(cdev->bus_id, BUS_ID_SIZE, "%s%d", adev->type, adev->number);
+        dev_set_name(cdev, "%s%d", adev->type, adev->number);
         err = device_register(cdev);
         if (err < 0)
                 return err;
diff --git a/net/atm/br2684.c b/net/atm/br2684.c
index 280de481edc7..ea9438fc6855 100644
--- a/net/atm/br2684.c
+++ b/net/atm/br2684.c
@@ -101,7 +101,7 @@ static LIST_HEAD(br2684_devs);
 
 static inline struct br2684_dev *BRPRIV(const struct net_device *net_dev)
 {
-        return (struct br2684_dev *)net_dev->priv;
+        return (struct br2684_dev *)netdev_priv(net_dev);
 }
 
 static inline struct net_device *list_entry_brdev(const struct list_head *le)
@@ -698,12 +698,11 @@ static int br2684_seq_show(struct seq_file *seq, void *v)
                                                     br2684_devs);
         const struct net_device *net_dev = brdev->net_dev;
         const struct br2684_vcc *brvcc;
-        DECLARE_MAC_BUF(mac);
 
-        seq_printf(seq, "dev %.16s: num=%d, mac=%s (%s)\n",
+        seq_printf(seq, "dev %.16s: num=%d, mac=%pM (%s)\n",
                    net_dev->name,
                    brdev->number,
-                   print_mac(mac, net_dev->dev_addr),
+                   net_dev->dev_addr,
                    brdev->mac_was_set ? "set" : "auto");
 
         list_for_each_entry(brvcc, &brdev->brvccs, brvccs) {
diff --git a/net/atm/clip.c b/net/atm/clip.c
index 5b5b96344ce6..2d33a83be799 100644
--- a/net/atm/clip.c
+++ b/net/atm/clip.c
@@ -822,8 +822,8 @@ static void atmarp_info(struct seq_file *seq, struct net_device *dev,
         seq_printf(seq, "%-6s%-4s%-4s%5ld ",
                    dev->name, svc ? "SVC" : "PVC", llc ? "LLC" : "NULL", exp);
 
-        off = scnprintf(buf, sizeof(buf) - 1, "%d.%d.%d.%d",
-                        NIPQUAD(entry->ip));
+        off = scnprintf(buf, sizeof(buf) - 1, "%pI4",
+                        &entry->ip);
         while (off < 16)
                 buf[off++] = ' ';
         buf[off] = '\0';
diff --git a/net/atm/common.h b/net/atm/common.h
index 16f32c1fa1c9..92e2981f479f 100644
--- a/net/atm/common.h
+++ b/net/atm/common.h
@@ -19,6 +19,7 @@ int vcc_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *m,
                 size_t total_len);
 unsigned int vcc_poll(struct file *file, struct socket *sock, poll_table *wait);
 int vcc_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg);
+int vcc_compat_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg);
 int vcc_setsockopt(struct socket *sock, int level, int optname,
                    char __user *optval, int optlen);
 int vcc_getsockopt(struct socket *sock, int level, int optname,
diff --git a/net/atm/ioctl.c b/net/atm/ioctl.c
index 7afd8e7754fd..76ed3c8d26e6 100644
--- a/net/atm/ioctl.c
+++ b/net/atm/ioctl.c
@@ -19,6 +19,7 @@
 #include <linux/atmlec.h>
 #include <linux/mutex.h>
 #include <asm/ioctls.h>
+#include <net/compat.h>
 
 #include "resources.h"
 #include "signaling.h"          /* for WAITING and sigd_attach */
@@ -46,7 +47,7 @@ void deregister_atm_ioctl(struct atm_ioctl *ioctl)
 EXPORT_SYMBOL(register_atm_ioctl);
 EXPORT_SYMBOL(deregister_atm_ioctl);
 
-int vcc_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
+static int do_vcc_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg, int compat)
 {
         struct sock *sk = sock->sk;
         struct atm_vcc *vcc;
@@ -80,13 +81,25 @@ int vcc_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
                                 goto done;
                         }
                 case SIOCGSTAMP: /* borrowed from IP */
-                        error = sock_get_timestamp(sk, argp);
+#ifdef CONFIG_COMPAT
+                        if (compat)
+                                error = compat_sock_get_timestamp(sk, argp);
+                        else
+#endif
+                                error = sock_get_timestamp(sk, argp);
                         goto done;
                 case SIOCGSTAMPNS: /* borrowed from IP */
-                        error = sock_get_timestampns(sk, argp);
+#ifdef CONFIG_COMPAT
+                        if (compat)
+                                error = compat_sock_get_timestampns(sk, argp);
+                        else
+#endif
+                                error = sock_get_timestampns(sk, argp);
                         goto done;
                 case ATM_SETSC:
-                        printk(KERN_WARNING "ATM_SETSC is obsolete\n");
+                        if (net_ratelimit())
+                                printk(KERN_WARNING "ATM_SETSC is obsolete; used by %s:%d\n",
+                                       current->comm, task_pid_nr(current));
                         error = 0;
                         goto done;
                 case ATMSIGD_CTRL:
@@ -99,12 +112,23 @@ int vcc_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
                          * info uses kernel pointers as opaque references,
                          * so the holder of the file descriptor can scribble
                          * on the kernel... so we should make sure that we
-                         * have the same privledges that /proc/kcore needs
+                         * have the same privileges that /proc/kcore needs
                          */
                         if (!capable(CAP_SYS_RAWIO)) {
                                 error = -EPERM;
                                 goto done;
                         }
+#ifdef CONFIG_COMPAT
+                        /* WTF? I don't even want to _think_ about making this
+                           work for 32-bit userspace. TBH I don't really want
+                           to think about it at all. dwmw2. */
+                        if (compat) {
+                                if (net_ratelimit())
+                                        printk(KERN_WARNING "32-bit task cannot be atmsigd\n");
+                                error = -EINVAL;
+                                goto done;
+                        }
+#endif
                         error = sigd_attach(vcc);
                         if (!error)
                                 sock->state = SS_CONNECTED;
@@ -155,8 +179,21 @@ int vcc_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
         if (error != -ENOIOCTLCMD)
                 goto done;
 
-        error = atm_dev_ioctl(cmd, argp);
+        error = atm_dev_ioctl(cmd, argp, compat);
 
 done:
         return error;
 }
+
+
+int vcc_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
+{
+        return do_vcc_ioctl(sock, cmd, arg, 0);
+}
+
+#ifdef CONFIG_COMPAT
+int vcc_compat_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
+{
+        return do_vcc_ioctl(sock, cmd, arg, 1);
+}
+#endif
diff --git a/net/atm/lec.c b/net/atm/lec.c
index 8f701cde5945..e5e301550e8a 100644
--- a/net/atm/lec.c
+++ b/net/atm/lec.c
@@ -152,7 +152,7 @@ static void lec_handle_bridge(struct sk_buff *skb, struct net_device *dev)
                 buff += 4;
                 mesg->content.normal.flag = *buff & 0x01;       /* 0x01 is topology change */
 
-                priv = (struct lec_priv *)dev->priv;
+                priv = netdev_priv(dev);
                 atm_force_charge(priv->lecd, skb2->truesize);
                 sk = sk_atm(priv->lecd);
                 skb_queue_tail(&sk->sk_receive_queue, skb2);
@@ -218,7 +218,7 @@ static unsigned char *get_tr_dst(unsigned char *packet, unsigned char *rdesc)
 
 static int lec_open(struct net_device *dev)
 {
-        struct lec_priv *priv = (struct lec_priv *)dev->priv;
+        struct lec_priv *priv = netdev_priv(dev);
 
         netif_start_queue(dev);
         memset(&priv->stats, 0, sizeof(struct net_device_stats));
@@ -252,7 +252,7 @@ static void lec_tx_timeout(struct net_device *dev)
 static int lec_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
         struct sk_buff *skb2;
-        struct lec_priv *priv = (struct lec_priv *)dev->priv;
+        struct lec_priv *priv = netdev_priv(dev);
         struct lecdatahdr_8023 *lec_h;
         struct atm_vcc *vcc;
         struct lec_arp_table *entry;
@@ -373,19 +373,13 @@ static int lec_start_xmit(struct sk_buff *skb, struct net_device *dev)
                 if (entry && (entry->tx_wait.qlen < LEC_UNRES_QUE_LEN)) {
                         pr_debug("%s:lec_start_xmit: queuing packet, ",
                                 dev->name);
-                        pr_debug("MAC address " MAC_FMT "\n",
-                                 lec_h->h_dest[0], lec_h->h_dest[1],
-                                 lec_h->h_dest[2], lec_h->h_dest[3],
-                                 lec_h->h_dest[4], lec_h->h_dest[5]);
+                        pr_debug("MAC address %pM\n", lec_h->h_dest);
                         skb_queue_tail(&entry->tx_wait, skb);
                 } else {
                         pr_debug
                             ("%s:lec_start_xmit: tx queue full or no arp entry, dropping, ",
                              dev->name);
-                        pr_debug("MAC address " MAC_FMT "\n",
-                                 lec_h->h_dest[0], lec_h->h_dest[1],
-                                 lec_h->h_dest[2], lec_h->h_dest[3],
-                                 lec_h->h_dest[4], lec_h->h_dest[5]);
+                        pr_debug("MAC address %pM\n", lec_h->h_dest);
                         priv->stats.tx_dropped++;
                         dev_kfree_skb(skb);
                 }
@@ -397,10 +391,7 @@ static int lec_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
         while (entry && (skb2 = skb_dequeue(&entry->tx_wait))) {
                 pr_debug("lec.c: emptying tx queue, ");
-                pr_debug("MAC address " MAC_FMT "\n",
-                         lec_h->h_dest[0], lec_h->h_dest[1],
-                         lec_h->h_dest[2], lec_h->h_dest[3],
-                         lec_h->h_dest[4], lec_h->h_dest[5]);
+                pr_debug("MAC address %pM\n", lec_h->h_dest);
                 lec_send(vcc, skb2, priv);
         }
 
@@ -442,14 +433,14 @@ static int lec_close(struct net_device *dev)
  */
 static struct net_device_stats *lec_get_stats(struct net_device *dev)
 {
-        return &((struct lec_priv *)dev->priv)->stats;
+        return &((struct lec_priv *)netdev_priv(dev))->stats;
 }
 
 static int lec_atm_send(struct atm_vcc *vcc, struct sk_buff *skb)
 {
         unsigned long flags;
         struct net_device *dev = (struct net_device *)vcc->proto_data;
-        struct lec_priv *priv = (struct lec_priv *)dev->priv;
+        struct lec_priv *priv = netdev_priv(dev);
         struct atmlec_msg *mesg;
         struct lec_arp_table *entry;
         int i;
@@ -539,15 +530,8 @@ static int lec_atm_send(struct atm_vcc *vcc, struct sk_buff *skb)
                 {
                         struct net_bridge_fdb_entry *f;
 
-                        pr_debug
-                            ("%s: bridge zeppelin asks about " MAC_FMT "\n",
-                             dev->name,
-                             mesg->content.proxy.mac_addr[0],
-                             mesg->content.proxy.mac_addr[1],
-                             mesg->content.proxy.mac_addr[2],
-                             mesg->content.proxy.mac_addr[3],
-                             mesg->content.proxy.mac_addr[4],
-                             mesg->content.proxy.mac_addr[5]);
+                        pr_debug("%s: bridge zeppelin asks about %pM\n",
+                                 dev->name, mesg->content.proxy.mac_addr);
 
                         if (br_fdb_get_hook == NULL || dev->br_port == NULL)
                                 break;
@@ -596,7 +580,7 @@ static void lec_atm_close(struct atm_vcc *vcc)
 {
         struct sk_buff *skb;
         struct net_device *dev = (struct net_device *)vcc->proto_data;
-        struct lec_priv *priv = (struct lec_priv *)dev->priv;
+        struct lec_priv *priv = netdev_priv(dev);
 
         priv->lecd = NULL;
         /* Do something needful? */
@@ -727,7 +711,7 @@ static void lec_push(struct atm_vcc *vcc, struct sk_buff *skb)
 {
         unsigned long flags;
         struct net_device *dev = (struct net_device *)vcc->proto_data;
-        struct lec_priv *priv = (struct lec_priv *)dev->priv;
+        struct lec_priv *priv = netdev_priv(dev);
 
 #if DUMP_PACKETS >0
         int i = 0;
@@ -874,7 +858,7 @@ static int lec_vcc_attach(struct atm_vcc *vcc, void __user *arg)
         vpriv->old_pop = vcc->pop;
         vcc->user_back = vpriv;
         vcc->pop = lec_pop;
-        lec_vcc_added(dev_lec[ioc_data.dev_num]->priv,
+        lec_vcc_added(netdev_priv(dev_lec[ioc_data.dev_num]),
                       &ioc_data, vcc, vcc->push);
         vcc->proto_data = dev_lec[ioc_data.dev_num];
         vcc->push = lec_push;
@@ -886,7 +870,8 @@ static int lec_mcast_attach(struct atm_vcc *vcc, int arg)
         if (arg < 0 || arg >= MAX_LEC_ITF || !dev_lec[arg])
                 return -EINVAL;
         vcc->proto_data = dev_lec[arg];
-        return (lec_mcast_make((struct lec_priv *)dev_lec[arg]->priv, vcc));
+        return lec_mcast_make((struct lec_priv *)netdev_priv(dev_lec[arg]),
+                                vcc);
 }
 
 /* Initialize device. */
@@ -928,11 +913,11 @@ static int lecd_attach(struct atm_vcc *vcc, int arg)
                         return -EINVAL;
                 }
 
-                priv = dev_lec[i]->priv;
+                priv = netdev_priv(dev_lec[i]);
                 priv->is_trdev = is_trdev;
                 lec_init(dev_lec[i]);
         } else {
-                priv = dev_lec[i]->priv;
+                priv = netdev_priv(dev_lec[i]);
                 if (priv->lecd)
                         return -EADDRINUSE;
         }
@@ -1093,7 +1078,8 @@ static void *lec_itf_walk(struct lec_state *state, loff_t *l)
         void *v;
 
         dev = state->dev ? state->dev : dev_lec[state->itf];
-        v = (dev && dev->priv) ? lec_priv_walk(state, l, dev->priv) : NULL;
+        v = (dev && netdev_priv(dev)) ?
+                lec_priv_walk(state, l, netdev_priv(dev)) : NULL;
         if (!v && dev) {
                 dev_put(dev);
                 /* Partial state reset for the next time we get called */
@@ -1255,7 +1241,7 @@ static void __exit lane_module_cleanup(void)
 
         for (i = 0; i < MAX_LEC_ITF; i++) {
                 if (dev_lec[i] != NULL) {
-                        priv = (struct lec_priv *)dev_lec[i]->priv;
+                        priv = netdev_priv(dev_lec[i]);
                         unregister_netdev(dev_lec[i]);
                         free_netdev(dev_lec[i]);
                         dev_lec[i] = NULL;
@@ -1279,7 +1265,7 @@ static int lane2_resolve(struct net_device *dev, const u8 *dst_mac, int force,
                          u8 **tlvs, u32 *sizeoftlvs)
 {
         unsigned long flags;
-        struct lec_priv *priv = (struct lec_priv *)dev->priv;
+        struct lec_priv *priv = netdev_priv(dev);
         struct lec_arp_table *table;
         struct sk_buff *skb;
         int retval;
@@ -1326,7 +1312,7 @@ static int lane2_associate_req(struct net_device *dev, const u8 *lan_dst,
 {
         int retval;
         struct sk_buff *skb;
-        struct lec_priv *priv = (struct lec_priv *)dev->priv;
+        struct lec_priv *priv = netdev_priv(dev);
 
         if (compare_ether_addr(lan_dst, dev->dev_addr))
                 return (0);     /* not our mac address */
@@ -1363,7 +1349,7 @@ static void lane2_associate_ind(struct net_device *dev, const u8 *mac_addr,
 #if 0
         int i = 0;
 #endif
-        struct lec_priv *priv = (struct lec_priv *)dev->priv;
+        struct lec_priv *priv = netdev_priv(dev);
 #if 0                           /*
                                  * Why have the TLVs in LE_ARP entries
                                  * since we do not use them? When you
diff --git a/net/atm/mpc.c b/net/atm/mpc.c
index 11b16d16661c..12e9ea371db1 100644
--- a/net/atm/mpc.c
+++ b/net/atm/mpc.c
@@ -232,8 +232,8 @@ void atm_mpoa_disp_qos(struct seq_file *m)
         seq_printf(m, "IP address\n  TX:max_pcr pcr     min_pcr max_cdv max_sdu\n  RX:max_pcr pcr     min_pcr max_cdv max_sdu\n");
 
         while (qos != NULL) {
-                seq_printf(m, "%u.%u.%u.%u\n     %-7d %-7d %-7d %-7d %-7d\n     %-7d %-7d %-7d %-7d %-7d\n",
-                                NIPQUAD(qos->ipaddr),
+                seq_printf(m, "%pI4\n     %-7d %-7d %-7d %-7d %-7d\n     %-7d %-7d %-7d %-7d %-7d\n",
+                                &qos->ipaddr,
                                 qos->qos.txtp.max_pcr, qos->qos.txtp.pcr, qos->qos.txtp.min_pcr, qos->qos.txtp.max_cdv, qos->qos.txtp.max_sdu,
                                 qos->qos.rxtp.max_pcr, qos->qos.rxtp.pcr, qos->qos.rxtp.min_pcr, qos->qos.rxtp.max_cdv, qos->qos.rxtp.max_sdu);
                 qos = qos->next;
@@ -595,8 +595,8 @@ static int atm_mpoa_vcc_attach(struct atm_vcc *vcc, void __user *arg)
                         if (in_entry != NULL) mpc->in_ops->put(in_entry);
                         return -EINVAL;
                 }
-                printk("mpoa: (%s) mpc_vcc_attach: attaching ingress SVC, entry = %u.%u.%u.%u\n",
-                       mpc->dev->name, NIPQUAD(in_entry->ctrl_info.in_dst_ip));
+                printk("mpoa: (%s) mpc_vcc_attach: attaching ingress SVC, entry = %pI4\n",
+                       mpc->dev->name, &in_entry->ctrl_info.in_dst_ip);
                 in_entry->shortcut = vcc;
                 mpc->in_ops->put(in_entry);
         } else {
@@ -627,8 +627,8 @@ static void mpc_vcc_close(struct atm_vcc *vcc, struct net_device *dev)
         dprintk("mpoa: (%s) mpc_vcc_close:\n", dev->name);
         in_entry = mpc->in_ops->get_by_vcc(vcc, mpc);
         if (in_entry) {
-                dprintk("mpoa: (%s) mpc_vcc_close: ingress SVC closed ip = %u.%u.%u.%u\n",
-                       mpc->dev->name, NIPQUAD(in_entry->ctrl_info.in_dst_ip));
+                dprintk("mpoa: (%s) mpc_vcc_close: ingress SVC closed ip = %pI4\n",
+                       mpc->dev->name, &in_entry->ctrl_info.in_dst_ip);
                 in_entry->shortcut = NULL;
                 mpc->in_ops->put(in_entry);
         }
@@ -785,7 +785,7 @@ static int atm_mpoa_mpoad_attach (struct atm_vcc *vcc, int arg)
         }
 
         if (mpc->dev) { /* check if the lec is LANE2 capable */
-                priv = (struct lec_priv *)mpc->dev->priv;
+                priv = netdev_priv(mpc->dev);
                 if (priv->lane_version < 2) {
                         dev_put(mpc->dev);
                         mpc->dev = NULL;
@@ -845,7 +845,7 @@ static void mpoad_close(struct atm_vcc *vcc)
 
         mpc->mpoad_vcc = NULL;
         if (mpc->dev) {
-                struct lec_priv *priv = (struct lec_priv *)mpc->dev->priv;
+                struct lec_priv *priv = netdev_priv(mpc->dev);
                 priv->lane2_ops->associate_indicator = NULL;
                 stop_mpc(mpc);
                 dev_put(mpc->dev);
@@ -976,7 +976,7 @@ static int mpoa_event_listener(struct notifier_block *mpoa_notifier, unsigned lo
 
         switch (event) {
         case NETDEV_REGISTER:       /* a new lec device was allocated */
-                priv = (struct lec_priv *)dev->priv;
+                priv = netdev_priv(dev);
                 if (priv->lane_version < 2)
                         break;
                 priv->lane2_ops->associate_indicator = lane2_assoc_ind;
@@ -1098,7 +1098,8 @@ static void check_qos_and_open_shortcut(struct k_message *msg, struct mpoa_clien
                                     entry->shortcut = eg_entry->shortcut;
                 }
                 if(entry->shortcut){
-                        dprintk("mpoa: (%s) using egress SVC to reach %u.%u.%u.%u\n",client->dev->name, NIPQUAD(dst_ip));
+                        dprintk("mpoa: (%s) using egress SVC to reach %pI4\n",
+                                client->dev->name, &dst_ip);
                         client->eg_ops->put(eg_entry);
                         return;
                 }
@@ -1123,7 +1124,8 @@ static void MPOA_res_reply_rcvd(struct k_message *msg, struct mpoa_client *mpc)
         __be32 dst_ip = msg->content.in_info.in_dst_ip;
         in_cache_entry *entry = mpc->in_ops->get(dst_ip, mpc);
 
-        dprintk("mpoa: (%s) MPOA_res_reply_rcvd: ip %u.%u.%u.%u\n", mpc->dev->name, NIPQUAD(dst_ip));
+        dprintk("mpoa: (%s) MPOA_res_reply_rcvd: ip %pI4\n",
+                mpc->dev->name, &dst_ip);
         ddprintk("mpoa: (%s) MPOA_res_reply_rcvd() entry = %p", mpc->dev->name, entry);
         if(entry == NULL){
                 printk("\nmpoa: (%s) ARGH, received res. reply for an entry that doesn't exist.\n", mpc->dev->name);
@@ -1171,14 +1173,14 @@ static void ingress_purge_rcvd(struct k_message *msg, struct mpoa_client *mpc)
         in_cache_entry *entry = mpc->in_ops->get_with_mask(dst_ip, mpc, mask);
 
         if(entry == NULL){
-                printk("mpoa: (%s) ingress_purge_rcvd: purge for a non-existing entry, ", mpc->dev->name);
-                printk("ip = %u.%u.%u.%u\n", NIPQUAD(dst_ip));
+                printk("mpoa: (%s) ingress_purge_rcvd: purge for a non-existing entry, ip = %pI4\n",
+                       mpc->dev->name, &dst_ip);
                 return;
         }
 
         do {
-                dprintk("mpoa: (%s) ingress_purge_rcvd: removing an ingress entry, ip = %u.%u.%u.%u\n" ,
-                        mpc->dev->name, NIPQUAD(dst_ip));
+                dprintk("mpoa: (%s) ingress_purge_rcvd: removing an ingress entry, ip = %pI4\n",
+                        mpc->dev->name, &dst_ip);
                 write_lock_bh(&mpc->ingress_lock);
                 mpc->in_ops->remove_entry(entry, mpc);
                 write_unlock_bh(&mpc->ingress_lock);
@@ -1322,7 +1324,7 @@ static void set_mpc_ctrl_addr_rcvd(struct k_message *mesg, struct mpoa_client *m
         dprintk("\n");
 
         if (mpc->dev) {
-                priv = (struct lec_priv *)mpc->dev->priv;
+                priv = netdev_priv(mpc->dev);
                 retval = priv->lane2_ops->associate_req(mpc->dev, mpc->dev->dev_addr, tlv, sizeof(tlv));
                 if (retval == 0)
                         printk("mpoa: (%s) MPOA device type TLV association failed\n", mpc->dev->name);
@@ -1472,7 +1474,7 @@ static void __exit atm_mpoa_cleanup(void)
                 tmp = mpc->next;
                 if (mpc->dev != NULL) {
                         stop_mpc(mpc);
-                        priv = (struct lec_priv *)mpc->dev->priv;
+                        priv = netdev_priv(mpc->dev);
                         if (priv->lane2_ops != NULL)
                                 priv->lane2_ops->associate_indicator = NULL;
                 }
diff --git a/net/atm/mpoa_caches.c b/net/atm/mpoa_caches.c
index 24799e3e78f7..4504a4b339bb 100644
--- a/net/atm/mpoa_caches.c
+++ b/net/atm/mpoa_caches.c
@@ -94,7 +94,7 @@ static in_cache_entry *in_cache_add_entry(__be32 dst_ip,
                 return NULL;
         }
 
-        dprintk("mpoa: mpoa_caches.c: adding an ingress entry, ip = %u.%u.%u.%u\n", NIPQUAD(dst_ip));
+        dprintk("mpoa: mpoa_caches.c: adding an ingress entry, ip = %pI4\n", &dst_ip);
 
         atomic_set(&entry->use, 1);
         dprintk("mpoa: mpoa_caches.c: new_in_cache_entry: about to lock\n");
@@ -150,7 +150,8 @@ static int cache_hit(in_cache_entry *entry, struct mpoa_client *mpc)
 
         if( entry->count > mpc->parameters.mpc_p1 &&
             entry->entry_state == INGRESS_INVALID){
-                dprintk("mpoa: (%s) mpoa_caches.c: threshold exceeded for ip %u.%u.%u.%u, sending MPOA res req\n", mpc->dev->name, NIPQUAD(entry->ctrl_info.in_dst_ip));
+                dprintk("mpoa: (%s) mpoa_caches.c: threshold exceeded for ip %pI4, sending MPOA res req\n",
+                        mpc->dev->name, &entry->ctrl_info.in_dst_ip);
                 entry->entry_state = INGRESS_RESOLVING;
                 msg.type =  SND_MPOA_RES_RQST;
                 memcpy(msg.MPS_ctrl, mpc->mps_ctrl_addr, ATM_ESA_LEN );
@@ -184,7 +185,8 @@ static void in_cache_remove_entry(in_cache_entry *entry,
         struct k_message msg;
 
         vcc = entry->shortcut;
-        dprintk("mpoa: mpoa_caches.c: removing an ingress entry, ip = %u.%u.%u.%u\n",NIPQUAD(entry->ctrl_info.in_dst_ip));
+        dprintk("mpoa: mpoa_caches.c: removing an ingress entry, ip = %pI4\n",
+                &entry->ctrl_info.in_dst_ip);
 
         if (entry->prev != NULL)
                 entry->prev->next = entry->next;
@@ -228,7 +230,8 @@ static void clear_count_and_expired(struct mpoa_client *client)
                 next_entry = entry->next;
                 if((now.tv_sec - entry->tv.tv_sec)
                    > entry->ctrl_info.holding_time){
-                        dprintk("mpoa: mpoa_caches.c: holding time expired, ip = %u.%u.%u.%u\n", NIPQUAD(entry->ctrl_info.in_dst_ip));
+                        dprintk("mpoa: mpoa_caches.c: holding time expired, ip = %pI4\n",
+                                &entry->ctrl_info.in_dst_ip);
                         client->in_ops->remove_entry(entry, client);
                 }
                 entry = next_entry;
@@ -453,7 +456,8 @@ static eg_cache_entry *eg_cache_add_entry(struct k_message *msg, struct mpoa_cli
                 return NULL;
         }
 
-        dprintk("mpoa: mpoa_caches.c: adding an egress entry, ip = %u.%u.%u.%u, this should be our IP\n", NIPQUAD(msg->content.eg_info.eg_dst_ip));
+        dprintk("mpoa: mpoa_caches.c: adding an egress entry, ip = %pI4, this should be our IP\n",
+                &msg->content.eg_info.eg_dst_ip);
 
         atomic_set(&entry->use, 1);
         dprintk("mpoa: mpoa_caches.c: new_eg_cache_entry: about to lock\n");
@@ -469,8 +473,8 @@ static eg_cache_entry *eg_cache_add_entry(struct k_message *msg, struct mpoa_cli
         do_gettimeofday(&(entry->tv));
         entry->entry_state = EGRESS_RESOLVED;
         dprintk("mpoa: mpoa_caches.c: new_eg_cache_entry cache_id %lu\n", ntohl(entry->ctrl_info.cache_id));
-        dprintk("mpoa: mpoa_caches.c: mps_ip = %u.%u.%u.%u\n",
-                NIPQUAD(entry->ctrl_info.mps_ip));
+        dprintk("mpoa: mpoa_caches.c: mps_ip = %pI4\n",
+                &entry->ctrl_info.mps_ip);
         atomic_inc(&entry->use);
 
         write_unlock_irq(&client->egress_lock);
diff --git a/net/atm/pvc.c b/net/atm/pvc.c
index 43e8bf5ed001..e1d22d9430dd 100644
--- a/net/atm/pvc.c
+++ b/net/atm/pvc.c
@@ -113,6 +113,9 @@ static const struct proto_ops pvc_proto_ops = {
         .getname =      pvc_getname,
         .poll =         vcc_poll,
         .ioctl =        vcc_ioctl,
+#ifdef CONFIG_COMPAT
+        .compat_ioctl = vcc_compat_ioctl,
+#endif
         .listen =       sock_no_listen,
         .shutdown =     pvc_shutdown,
         .setsockopt =   pvc_setsockopt,
diff --git a/net/atm/resources.c b/net/atm/resources.c
index a34ba948af96..56b7322ff461 100644
--- a/net/atm/resources.c
+++ b/net/atm/resources.c
@@ -195,20 +195,39 @@ static int fetch_stats(struct atm_dev *dev, struct atm_dev_stats __user *arg, in
 }
 
 
-int atm_dev_ioctl(unsigned int cmd, void __user *arg)
+int atm_dev_ioctl(unsigned int cmd, void __user *arg, int compat)
 {
         void __user *buf;
         int error, len, number, size = 0;
         struct atm_dev *dev;
         struct list_head *p;
         int *tmp_buf, *tmp_p;
-        struct atm_iobuf __user *iobuf = arg;
-        struct atmif_sioc __user *sioc = arg;
+        int __user *sioc_len;
+        int __user *iobuf_len;
+
+#ifndef CONFIG_COMPAT
+        compat = 0; /* Just so the compiler _knows_ */
+#endif
+
         switch (cmd) {
                 case ATM_GETNAMES:
-                        if (get_user(buf, &iobuf->buffer))
-                                return -EFAULT;
-                        if (get_user(len, &iobuf->length))
+
+                        if (compat) {
+#ifdef CONFIG_COMPAT
+                                struct compat_atm_iobuf __user *ciobuf = arg;
+                                compat_uptr_t cbuf;
+                                iobuf_len = &ciobuf->length;
+                                if (get_user(cbuf, &ciobuf->buffer))
+                                        return -EFAULT;
+                                buf = compat_ptr(cbuf);
+#endif
+                        } else {
+                                struct atm_iobuf __user *iobuf = arg;
+                                iobuf_len = &iobuf->length;
+                                if (get_user(buf, &iobuf->buffer))
+                                        return -EFAULT;
+                        }
+                        if (get_user(len, iobuf_len))
                                 return -EFAULT;
                         mutex_lock(&atm_dev_mutex);
                         list_for_each(p, &atm_devs)
@@ -229,7 +248,7 @@ int atm_dev_ioctl(unsigned int cmd, void __user *arg)
                         }
                         mutex_unlock(&atm_dev_mutex);
                         error = ((copy_to_user(buf, tmp_buf, size)) ||
-                                        put_user(size, &iobuf->length))
+                                        put_user(size, iobuf_len))
                                                 ? -EFAULT : 0;
                         kfree(tmp_buf);
                         return error;
@@ -237,13 +256,32 @@ int atm_dev_ioctl(unsigned int cmd, void __user *arg)
                         break;
         }
 
-        if (get_user(buf, &sioc->arg))
-                return -EFAULT;
-        if (get_user(len, &sioc->length))
-                return -EFAULT;
-        if (get_user(number, &sioc->number))
-                return -EFAULT;
-
+        if (compat) {
+#ifdef CONFIG_COMPAT
+                struct compat_atmif_sioc __user *csioc = arg;
+                compat_uptr_t carg;
+
+                sioc_len = &csioc->length;
+                if (get_user(carg, &csioc->arg))
+                        return -EFAULT;
+                buf = compat_ptr(carg);
+
+                if (get_user(len, &csioc->length))
+                        return -EFAULT;
+                if (get_user(number, &csioc->number))
+                        return -EFAULT;
+#endif
+        } else {
+                struct atmif_sioc __user *sioc = arg;
+
+                sioc_len = &sioc->length;
+                if (get_user(buf, &sioc->arg))
+                        return -EFAULT;
+                if (get_user(len, &sioc->length))
+                        return -EFAULT;
+                if (get_user(number, &sioc->number))
+                        return -EFAULT;
+        }
         if (!(dev = try_then_request_module(atm_dev_lookup(number),
                                             "atm-device-%d", number)))
                 return -ENODEV;
@@ -358,7 +396,7 @@ int atm_dev_ioctl(unsigned int cmd, void __user *arg)
                         size = error;
                         /* may return 0, but later on size == 0 means "don't
                            write the length" */
-                        error = put_user(size, &sioc->length)
+                        error = put_user(size, sioc_len)
                                 ? -EFAULT : 0;
                         goto done;
                 case ATM_SETLOOP:
@@ -380,11 +418,21 @@ int atm_dev_ioctl(unsigned int cmd, void __user *arg)
                         }
                         /* fall through */
                 default:
-                        if (!dev->ops->ioctl) {
-                                error = -EINVAL;
-                                goto done;
+                        if (compat) {
+#ifdef CONFIG_COMPAT
+                                if (!dev->ops->compat_ioctl) {
+                                        error = -EINVAL;
+                                        goto done;
+                                }
+                                size = dev->ops->compat_ioctl(dev, cmd, buf);
+#endif
+                        } else {
+                                if (!dev->ops->ioctl) {
+                                        error = -EINVAL;
+                                        goto done;
+                                }
+                                size = dev->ops->ioctl(dev, cmd, buf);
                         }
-                        size = dev->ops->ioctl(dev, cmd, buf);
                         if (size < 0) {
                                 error = (size == -ENOIOCTLCMD ? -EINVAL : size);
                                 goto done;
@@ -392,7 +440,7 @@ int atm_dev_ioctl(unsigned int cmd, void __user *arg)
         }
 
         if (size)
-                error = put_user(size, &sioc->length)
+                error = put_user(size, sioc_len)
                         ? -EFAULT : 0;
         else
                 error = 0;
diff --git a/net/atm/resources.h b/net/atm/resources.h
index 1d004aaaeec1..126fb1840dfb 100644
--- a/net/atm/resources.h
+++ b/net/atm/resources.h
@@ -13,7 +13,7 @@
 extern struct list_head atm_devs;
 extern struct mutex atm_dev_mutex;
 
-int atm_dev_ioctl(unsigned int cmd, void __user *arg);
+int atm_dev_ioctl(unsigned int cmd, void __user *arg, int compat);
 
 
 #ifdef CONFIG_PROC_FS
diff --git a/net/atm/svc.c b/net/atm/svc.c
index 8fb54dc870b3..7b831b526d0b 100644
--- a/net/atm/svc.c
+++ b/net/atm/svc.c
@@ -608,6 +608,22 @@ static int svc_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
         return error;
 }
 
+#ifdef CONFIG_COMPAT
+static int svc_compat_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
+{
+        /* The definition of ATM_ADDPARTY uses the size of struct atm_iobuf.
+           But actually it takes a struct sockaddr_atmsvc, which doesn't need
+           compat handling. So all we have to do is fix up cmd... */
+        if (cmd == COMPAT_ATM_ADDPARTY)
+                cmd = ATM_ADDPARTY;
+
+        if (cmd == ATM_ADDPARTY || cmd == ATM_DROPPARTY)
+                return svc_ioctl(sock, cmd, arg);
+        else
+                return vcc_compat_ioctl(sock, cmd, arg);
+}
+#endif /* CONFIG_COMPAT */
+
 static const struct proto_ops svc_proto_ops = {
         .family =       PF_ATMSVC,
         .owner =        THIS_MODULE,
@@ -620,6 +636,9 @@ static const struct proto_ops svc_proto_ops = {
         .getname =      svc_getname,
         .poll =         vcc_poll,
         .ioctl =        svc_ioctl,
+#ifdef CONFIG_COMPAT
+        .compat_ioctl = svc_compat_ioctl,
+#endif
         .listen =       svc_listen,
         .shutdown =     svc_shutdown,
         .setsockopt =   svc_setsockopt,