net: use the macros defined for the members of flowi
[linux-3.10.git] / net / atm / clip.c
index ebb5d0c..d257da5 100644 (file)
@@ -2,6 +2,8 @@
 
 /* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ":%s: " fmt, __func__
+
 #include <linux/string.h>
 #include <linux/errno.h>
 #include <linux/kernel.h> /* for UINT_MAX */
 #include <linux/seq_file.h>
 #include <linux/rcupdate.h>
 #include <linux/jhash.h>
+#include <linux/slab.h>
 #include <net/route.h> /* for struct rtable and routing */
 #include <net/icmp.h> /* icmp_send */
-#include <asm/param.h> /* for HZ */
+#include <linux/param.h> /* for HZ */
+#include <linux/uaccess.h>
 #include <asm/byteorder.h> /* for htons etc. */
 #include <asm/system.h> /* save/restore_flags */
-#include <asm/uaccess.h>
 #include <asm/atomic.h>
 
 #include "common.h"
 #include "resources.h"
 #include <net/atmclip.h>
 
-
-#if 0
-#define DPRINTK(format,args...) printk(format,##args)
-#else
-#define DPRINTK(format,args...)
-#endif
-
-
 static struct net_device *clip_devs;
 static struct atm_vcc *atmarpd;
 static struct neigh_table clip_tbl;
@@ -59,13 +54,13 @@ static int to_atmarpd(enum atmarp_ctrl_type type, int itf, __be32 ip)
        struct atmarp_ctrl *ctrl;
        struct sk_buff *skb;
 
-       DPRINTK("to_atmarpd(%d)\n", type);
+       pr_debug("(%d)\n", type);
        if (!atmarpd)
                return -EUNATCH;
-       skb = alloc_skb(sizeof(struct atmarp_ctrl),GFP_ATOMIC);
+       skb = alloc_skb(sizeof(struct atmarp_ctrl), GFP_ATOMIC);
        if (!skb)
                return -ENOMEM;
-       ctrl = (struct atmarp_ctrl *) skb_put(skb,sizeof(struct atmarp_ctrl));
+       ctrl = (struct atmarp_ctrl *)skb_put(skb, sizeof(struct atmarp_ctrl));
        ctrl->type = type;
        ctrl->itf_num = itf;
        ctrl->ip = ip;
@@ -79,8 +74,7 @@ static int to_atmarpd(enum atmarp_ctrl_type type, int itf, __be32 ip)
 
 static void link_vcc(struct clip_vcc *clip_vcc, struct atmarp_entry *entry)
 {
-       DPRINTK("link_vcc %p to entry %p (neigh %p)\n", clip_vcc, entry,
-               entry->neigh);
+       pr_debug("%p to entry %p (neigh %p)\n", clip_vcc, entry, entry->neigh);
        clip_vcc->entry = entry;
        clip_vcc->xoff = 0;     /* @@@ may overrun buffer by one packet */
        clip_vcc->next = entry->vccs;
@@ -94,7 +88,7 @@ static void unlink_clip_vcc(struct clip_vcc *clip_vcc)
        struct clip_vcc **walk;
 
        if (!entry) {
-               printk(KERN_CRIT "!clip_vcc->entry (clip_vcc %p)\n", clip_vcc);
+               pr_crit("!clip_vcc->entry (clip_vcc %p)\n", clip_vcc);
                return;
        }
        netif_tx_lock_bh(entry->neigh->dev);    /* block clip_start_xmit() */
@@ -114,13 +108,11 @@ static void unlink_clip_vcc(struct clip_vcc *clip_vcc)
                        error = neigh_update(entry->neigh, NULL, NUD_NONE,
                                             NEIGH_UPDATE_F_ADMIN);
                        if (error)
-                               printk(KERN_CRIT "unlink_clip_vcc: "
-                                      "neigh_update failed with %d\n", error);
+                               pr_crit("neigh_update failed with %d\n", error);
                        goto out;
                }
-       printk(KERN_CRIT "ATMARP: unlink_clip_vcc failed (entry %p, vcc "
-              "0x%p)\n", entry, clip_vcc);
-      out:
+       pr_crit("ATMARP: failed (entry %p, vcc 0x%p)\n", entry, clip_vcc);
+out:
        netif_tx_unlock_bh(entry->neigh->dev);
 }
 
@@ -134,8 +126,8 @@ static int neigh_check_cb(struct neighbour *n)
                unsigned long exp = cv->last_use + cv->idle_timeout;
 
                if (cv->idle_timeout && time_after(jiffies, exp)) {
-                       DPRINTK("releasing vcc %p->%p of entry %p\n",
-                               cv, cv->vcc, entry);
+                       pr_debug("releasing vcc %p->%p of entry %p\n",
+                                cv, cv->vcc, entry);
                        vcc_release_async(cv->vcc, -ETIMEDOUT);
                }
        }
@@ -146,8 +138,8 @@ static int neigh_check_cb(struct neighbour *n)
        if (atomic_read(&n->refcnt) > 1) {
                struct sk_buff *skb;
 
-               DPRINTK("destruction postponed with ref %d\n",
-                       atomic_read(&n->refcnt));
+               pr_debug("destruction postponed with ref %d\n",
+                        atomic_read(&n->refcnt));
 
                while ((skb = skb_dequeue(&n->arp_queue)) != NULL)
                        dev_kfree_skb(skb);
@@ -155,7 +147,7 @@ static int neigh_check_cb(struct neighbour *n)
                return 0;
        }
 
-       DPRINTK("expired neigh %p\n", n);
+       pr_debug("expired neigh %p\n", n);
        return 1;
 }
 
@@ -171,14 +163,14 @@ static int clip_arp_rcv(struct sk_buff *skb)
 {
        struct atm_vcc *vcc;
 
-       DPRINTK("clip_arp_rcv\n");
+       pr_debug("\n");
        vcc = ATM_SKB(skb)->vcc;
        if (!vcc || !atm_charge(vcc, skb->truesize)) {
                dev_kfree_skb_any(skb);
                return 0;
        }
-       DPRINTK("pushing to %p\n", vcc);
-       DPRINTK("using %p\n", CLIP_VCC(vcc)->old_push);
+       pr_debug("pushing to %p\n", vcc);
+       pr_debug("using %p\n", CLIP_VCC(vcc)->old_push);
        CLIP_VCC(vcc)->old_push(vcc, skb);
        return 0;
 }
@@ -196,9 +188,9 @@ static void clip_push(struct atm_vcc *vcc, struct sk_buff *skb)
 {
        struct clip_vcc *clip_vcc = CLIP_VCC(vcc);
 
-       DPRINTK("clip push\n");
+       pr_debug("\n");
        if (!skb) {
-               DPRINTK("removing VCC %p\n", clip_vcc);
+               pr_debug("removing VCC %p\n", clip_vcc);
                if (clip_vcc->entry)
                        unlink_clip_vcc(clip_vcc);
                clip_vcc->old_push(vcc, NULL);  /* pass on the bad news */
@@ -213,24 +205,24 @@ static void clip_push(struct atm_vcc *vcc, struct sk_buff *skb)
                return;
        }
        ATM_SKB(skb)->vcc = vcc;
-       skb->mac.raw = skb->data;
-       if (!clip_vcc->encap
-           || skb->len < RFC1483LLC_LEN
-           || memcmp(skb->data, llc_oui, sizeof (llc_oui)))
+       skb_reset_mac_header(skb);
+       if (!clip_vcc->encap ||
+           skb->len < RFC1483LLC_LEN ||
+           memcmp(skb->data, llc_oui, sizeof(llc_oui)))
                skb->protocol = htons(ETH_P_IP);
        else {
-               skb->protocol = ((__be16 *) skb->data)[3];
+               skb->protocol = ((__be16 *)skb->data)[3];
                skb_pull(skb, RFC1483LLC_LEN);
                if (skb->protocol == htons(ETH_P_ARP)) {
-                       PRIV(skb->dev)->stats.rx_packets++;
-                       PRIV(skb->dev)->stats.rx_bytes += skb->len;
+                       skb->dev->stats.rx_packets++;
+                       skb->dev->stats.rx_bytes += skb->len;
                        clip_arp_rcv(skb);
                        return;
                }
        }
        clip_vcc->last_use = jiffies;
-       PRIV(skb->dev)->stats.rx_packets++;
-       PRIV(skb->dev)->stats.rx_bytes += skb->len;
+       skb->dev->stats.rx_packets++;
+       skb->dev->stats.rx_bytes += skb->len;
        memset(ATM_SKB(skb), 0, sizeof(struct atm_skb_data));
        netif_rx(skb);
 }
@@ -247,7 +239,7 @@ static void clip_pop(struct atm_vcc *vcc, struct sk_buff *skb)
        int old;
        unsigned long flags;
 
-       DPRINTK("clip_pop(vcc %p)\n", vcc);
+       pr_debug("(vcc %p)\n", vcc);
        clip_vcc->old_pop(vcc, skb);
        /* skb->dev == NULL in outbound ARP packets */
        if (!dev)
@@ -261,17 +253,9 @@ static void clip_pop(struct atm_vcc *vcc, struct sk_buff *skb)
        spin_unlock_irqrestore(&PRIV(dev)->xoff_lock, flags);
 }
 
-static void clip_neigh_destroy(struct neighbour *neigh)
-{
-       DPRINTK("clip_neigh_destroy (neigh %p)\n", neigh);
-       if (NEIGH2ENTRY(neigh)->vccs)
-               printk(KERN_CRIT "clip_neigh_destroy: vccs != NULL !!!\n");
-       NEIGH2ENTRY(neigh)->vccs = (void *) NEIGHBOR_DEAD;
-}
-
 static void clip_neigh_solicit(struct neighbour *neigh, struct sk_buff *skb)
 {
-       DPRINTK("clip_neigh_solicit (neigh %p, skb %p)\n", neigh, skb);
+       pr_debug("(neigh %p, skb %p)\n", neigh, skb);
        to_atmarpd(act_need, PRIV(neigh->dev)->number, NEIGH2ENTRY(neigh)->ip);
 }
 
@@ -283,7 +267,7 @@ static void clip_neigh_error(struct neighbour *neigh, struct sk_buff *skb)
        kfree_skb(skb);
 }
 
-static struct neigh_ops clip_neigh_ops = {
+static const struct neigh_ops clip_neigh_ops = {
        .family =               AF_INET,
        .solicit =              clip_neigh_solicit,
        .error_report =         clip_neigh_error,
@@ -300,8 +284,8 @@ static int clip_constructor(struct neighbour *neigh)
        struct in_device *in_dev;
        struct neigh_parms *parms;
 
-       DPRINTK("clip_constructor (neigh %p, entry %p)\n", neigh, entry);
-       neigh->type = inet_addr_type(entry->ip);
+       pr_debug("(neigh %p, entry %p)\n", neigh, entry);
+       neigh->type = inet_addr_type(&init_net, entry->ip);
        if (neigh->type != RTN_UNICAST)
                return -EINVAL;
 
@@ -326,9 +310,9 @@ static int clip_constructor(struct neighbour *neigh)
        return 0;
 }
 
-static u32 clip_hash(const void *pkey, const struct net_device *dev)
+static u32 clip_hash(const void *pkey, const struct net_device *dev, __u32 rnd)
 {
-       return jhash_2words(*(u32 *) pkey, dev->ifindex, clip_tbl.hash_rnd);
+       return jhash_2words(*(u32 *) pkey, dev->ifindex, rnd);
 }
 
 static struct neigh_table clip_tbl = {
@@ -342,7 +326,6 @@ static struct neigh_table clip_tbl = {
        /* parameters are copied from ARP ... */
        .parms = {
                .tbl                    = &clip_tbl,
-               .neigh_destructor       = clip_neigh_destroy,
                .base_reachable_time    = 30 * HZ,
                .retrans_time           = 1 * HZ,
                .gc_staletime           = 60 * HZ,
@@ -377,7 +360,8 @@ static int clip_encap(struct atm_vcc *vcc, int mode)
        return 0;
 }
 
-static int clip_start_xmit(struct sk_buff *skb, struct net_device *dev)
+static netdev_tx_t clip_start_xmit(struct sk_buff *skb,
+                                  struct net_device *dev)
 {
        struct clip_priv *clip_priv = PRIV(dev);
        struct atmarp_entry *entry;
@@ -385,28 +369,28 @@ static int clip_start_xmit(struct sk_buff *skb, struct net_device *dev)
        int old;
        unsigned long flags;
 
-       DPRINTK("clip_start_xmit (skb %p)\n", skb);
-       if (!skb->dst) {
-               printk(KERN_ERR "clip_start_xmit: skb->dst == NULL\n");
+       pr_debug("(skb %p)\n", skb);
+       if (!skb_dst(skb)) {
+               pr_err("skb_dst(skb) == NULL\n");
                dev_kfree_skb(skb);
-               clip_priv->stats.tx_dropped++;
-               return 0;
+               dev->stats.tx_dropped++;
+               return NETDEV_TX_OK;
        }
-       if (!skb->dst->neighbour) {
+       if (!skb_dst(skb)->neighbour) {
 #if 0
-               skb->dst->neighbour = clip_find_neighbour(skb->dst, 1);
-               if (!skb->dst->neighbour) {
+               skb_dst(skb)->neighbour = clip_find_neighbour(skb_dst(skb), 1);
+               if (!skb_dst(skb)->neighbour) {
                        dev_kfree_skb(skb);     /* lost that one */
-                       clip_priv->stats.tx_dropped++;
+                       dev->stats.tx_dropped++;
                        return 0;
                }
 #endif
-               printk(KERN_ERR "clip_start_xmit: NO NEIGHBOUR !\n");
+               pr_err("NO NEIGHBOUR !\n");
                dev_kfree_skb(skb);
-               clip_priv->stats.tx_dropped++;
-               return 0;
+               dev->stats.tx_dropped++;
+               return NETDEV_TX_OK;
        }
-       entry = NEIGH2ENTRY(skb->dst->neighbour);
+       entry = NEIGH2ENTRY(skb_dst(skb)->neighbour);
        if (!entry->vccs) {
                if (time_after(jiffies, entry->expires)) {
                        /* should be resolved */
@@ -417,13 +401,13 @@ static int clip_start_xmit(struct sk_buff *skb, struct net_device *dev)
                        skb_queue_tail(&entry->neigh->arp_queue, skb);
                else {
                        dev_kfree_skb(skb);
-                       clip_priv->stats.tx_dropped++;
+                       dev->stats.tx_dropped++;
                }
-               return 0;
+               return NETDEV_TX_OK;
        }
-       DPRINTK("neigh %p, vccs %p\n", entry, entry->vccs);
+       pr_debug("neigh %p, vccs %p\n", entry, entry->vccs);
        ATM_SKB(skb)->vcc = vcc = entry->vccs->vcc;
-       DPRINTK("using neighbour %p, vcc %p\n", skb->dst->neighbour, vcc);
+       pr_debug("using neighbour %p, vcc %p\n", skb_dst(skb)->neighbour, vcc);
        if (entry->vccs->encap) {
                void *here;
 
@@ -434,18 +418,18 @@ static int clip_start_xmit(struct sk_buff *skb, struct net_device *dev)
        atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
        ATM_SKB(skb)->atm_options = vcc->atm_options;
        entry->vccs->last_use = jiffies;
-       DPRINTK("atm_skb(%p)->vcc(%p)->dev(%p)\n", skb, vcc, vcc->dev);
+       pr_debug("atm_skb(%p)->vcc(%p)->dev(%p)\n", skb, vcc, vcc->dev);
        old = xchg(&entry->vccs->xoff, 1);      /* assume XOFF ... */
        if (old) {
-               printk(KERN_WARNING "clip_start_xmit: XOFF->XOFF transition\n");
-               return 0;
+               pr_warning("XOFF->XOFF transition\n");
+               return NETDEV_TX_OK;
        }
-       clip_priv->stats.tx_packets++;
-       clip_priv->stats.tx_bytes += skb->len;
+       dev->stats.tx_packets++;
+       dev->stats.tx_bytes += skb->len;
        vcc->send(vcc, skb);
        if (atm_may_send(vcc, 0)) {
                entry->vccs->xoff = 0;
-               return 0;
+               return NETDEV_TX_OK;
        }
        spin_lock_irqsave(&clip_priv->xoff_lock, flags);
        netif_stop_queue(dev);  /* XOFF -> throttle immediately */
@@ -457,19 +441,14 @@ static int clip_start_xmit(struct sk_buff *skb, struct net_device *dev)
           of the brief netif_stop_queue. If this isn't true or if it
           changes, use netif_wake_queue instead. */
        spin_unlock_irqrestore(&clip_priv->xoff_lock, flags);
-       return 0;
-}
-
-static struct net_device_stats *clip_get_stats(struct net_device *dev)
-{
-       return &PRIV(dev)->stats;
+       return NETDEV_TX_OK;
 }
 
 static int clip_mkip(struct atm_vcc *vcc, int timeout)
 {
+       struct sk_buff_head *rq, queue;
        struct clip_vcc *clip_vcc;
-       struct sk_buff *skb;
-       struct sk_buff_head *rq;
+       struct sk_buff *skb, *tmp;
        unsigned long flags;
 
        if (!vcc->push)
@@ -477,7 +456,7 @@ static int clip_mkip(struct atm_vcc *vcc, int timeout)
        clip_vcc = kmalloc(sizeof(struct clip_vcc), GFP_KERNEL);
        if (!clip_vcc)
                return -ENOMEM;
-       DPRINTK("mkip clip_vcc %p vcc %p\n", clip_vcc, vcc);
+       pr_debug("%p vcc %p\n", clip_vcc, vcc);
        clip_vcc->vcc = vcc;
        vcc->user_back = clip_vcc;
        set_bit(ATM_VF_IS_CLIP, &vcc->flags);
@@ -491,39 +470,28 @@ static int clip_mkip(struct atm_vcc *vcc, int timeout)
        vcc->push = clip_push;
        vcc->pop = clip_pop;
 
+       __skb_queue_head_init(&queue);
        rq = &sk_atm(vcc)->sk_receive_queue;
 
        spin_lock_irqsave(&rq->lock, flags);
-       if (skb_queue_empty(rq)) {
-               skb = NULL;
-       } else {
-               /* NULL terminate the list.  */
-               rq->prev->next = NULL;
-               skb = rq->next;
-       }
-       rq->prev = rq->next = (struct sk_buff *)rq;
-       rq->qlen = 0;
+       skb_queue_splice_init(rq, &queue);
        spin_unlock_irqrestore(&rq->lock, flags);
 
        /* re-process everything received between connection setup and MKIP */
-       while (skb) {
-               struct sk_buff *next = skb->next;
-
-               skb->next = skb->prev = NULL;
+       skb_queue_walk_safe(&queue, skb, tmp) {
                if (!clip_devs) {
                        atm_return(vcc, skb->truesize);
                        kfree_skb(skb);
                } else {
+                       struct net_device *dev = skb->dev;
                        unsigned int len = skb->len;
 
                        skb_get(skb);
                        clip_push(vcc, skb);
-                       PRIV(skb->dev)->stats.rx_packets--;
-                       PRIV(skb->dev)->stats.rx_bytes -= len;
+                       dev->stats.rx_packets--;
+                       dev->stats.rx_bytes -= len;
                        kfree_skb(skb);
                }
-
-               skb = next;
        }
        return 0;
 }
@@ -534,36 +502,37 @@ static int clip_setentry(struct atm_vcc *vcc, __be32 ip)
        struct atmarp_entry *entry;
        int error;
        struct clip_vcc *clip_vcc;
-       struct flowi fl = { .nl_u = { .ip4_u = { .daddr = ip, .tos = 1}} };
+       struct flowi fl = { .fl4_dst = ip,
+                           .fl4_tos = 1 };
        struct rtable *rt;
 
        if (vcc->push != clip_push) {
-               printk(KERN_WARNING "clip_setentry: non-CLIP VCC\n");
+               pr_warning("non-CLIP VCC\n");
                return -EBADF;
        }
        clip_vcc = CLIP_VCC(vcc);
        if (!ip) {
                if (!clip_vcc->entry) {
-                       printk(KERN_ERR "hiding hidden ATMARP entry\n");
+                       pr_err("hiding hidden ATMARP entry\n");
                        return 0;
                }
-               DPRINTK("setentry: remove\n");
+               pr_debug("remove\n");
                unlink_clip_vcc(clip_vcc);
                return 0;
        }
-       error = ip_route_output_key(&rt, &fl);
+       error = ip_route_output_key(&init_net, &rt, &fl);
        if (error)
                return error;
-       neigh = __neigh_lookup(&clip_tbl, &ip, rt->u.dst.dev, 1);
+       neigh = __neigh_lookup(&clip_tbl, &ip, rt->dst.dev, 1);
        ip_rt_put(rt);
        if (!neigh)
                return -ENOMEM;
        entry = NEIGH2ENTRY(neigh);
        if (entry != clip_vcc->entry) {
                if (!clip_vcc->entry)
-                       DPRINTK("setentry: add\n");
+                       pr_debug("add\n");
                else {
-                       DPRINTK("setentry: update\n");
+                       pr_debug("update\n");
                        unlink_clip_vcc(clip_vcc);
                }
                link_vcc(clip_vcc, entry);
@@ -574,11 +543,13 @@ static int clip_setentry(struct atm_vcc *vcc, __be32 ip)
        return error;
 }
 
+static const struct net_device_ops clip_netdev_ops = {
+       .ndo_start_xmit = clip_start_xmit,
+};
+
 static void clip_setup(struct net_device *dev)
 {
-       dev->hard_start_xmit = clip_start_xmit;
-       /* sg_xmit ... */
-       dev->get_stats = clip_get_stats;
+       dev->netdev_ops = &clip_netdev_ops;
        dev->type = ARPHRD_ATM;
        dev->hard_header_len = RFC1483LLC_LEN;
        dev->mtu = RFC1626_MTU;
@@ -588,6 +559,7 @@ static void clip_setup(struct net_device *dev)
        /* without any more elaborate queuing. 100 is a reasonable */
        /* compromise between decent burst-tolerance and protection */
        /* against memory hogs. */
+       dev->priv_flags &= ~IFF_XMIT_DST_RELEASE;
 }
 
 static int clip_create(int number)
@@ -620,7 +592,7 @@ static int clip_create(int number)
        }
        clip_priv->next = clip_devs;
        clip_devs = dev;
-       DPRINTK("registered (net:%s)\n", dev->name);
+       pr_debug("registered (net:%s)\n", dev->name);
        return number;
 }
 
@@ -629,27 +601,30 @@ static int clip_device_event(struct notifier_block *this, unsigned long event,
 {
        struct net_device *dev = arg;
 
+       if (!net_eq(dev_net(dev), &init_net))
+               return NOTIFY_DONE;
+
        if (event == NETDEV_UNREGISTER) {
                neigh_ifdown(&clip_tbl, dev);
                return NOTIFY_DONE;
        }
 
        /* ignore non-CLIP devices */
-       if (dev->type != ARPHRD_ATM || dev->hard_start_xmit != clip_start_xmit)
+       if (dev->type != ARPHRD_ATM || dev->netdev_ops != &clip_netdev_ops)
                return NOTIFY_DONE;
 
        switch (event) {
        case NETDEV_UP:
-               DPRINTK("clip_device_event NETDEV_UP\n");
+               pr_debug("NETDEV_UP\n");
                to_atmarpd(act_up, PRIV(dev)->number, 0);
                break;
        case NETDEV_GOING_DOWN:
-               DPRINTK("clip_device_event NETDEV_DOWN\n");
+               pr_debug("NETDEV_DOWN\n");
                to_atmarpd(act_down, PRIV(dev)->number, 0);
                break;
        case NETDEV_CHANGE:
        case NETDEV_CHANGEMTU:
-               DPRINTK("clip_device_event NETDEV_CHANGE*\n");
+               pr_debug("NETDEV_CHANGE*\n");
                to_atmarpd(act_change, PRIV(dev)->number, 0);
                break;
        }
@@ -662,10 +637,6 @@ static int clip_inet_event(struct notifier_block *this, unsigned long event,
        struct in_device *in_dev;
 
        in_dev = ((struct in_ifaddr *)ifa)->ifa_dev;
-       if (!in_dev || !in_dev->dev) {
-               printk(KERN_WARNING "clip_inet_event: no device\n");
-               return NOTIFY_DONE;
-       }
        /*
         * Transitions are of the down-change-up type, so it's sufficient to
         * handle the change on up.
@@ -675,7 +646,6 @@ static int clip_inet_event(struct notifier_block *this, unsigned long event,
        return clip_device_event(this, NETDEV_CHANGE, in_dev->dev);
 }
 
-
 static struct notifier_block clip_dev_notifier = {
        .notifier_call = clip_device_event,
 };
@@ -690,18 +660,17 @@ static struct notifier_block clip_inet_notifier = {
 
 static void atmarpd_close(struct atm_vcc *vcc)
 {
-       DPRINTK("atmarpd_close\n");
+       pr_debug("\n");
 
        rtnl_lock();
        atmarpd = NULL;
        skb_queue_purge(&sk_atm(vcc)->sk_receive_queue);
        rtnl_unlock();
 
-       DPRINTK("(done)\n");
+       pr_debug("(done)\n");
        module_put(THIS_MODULE);
 }
 
-
 static struct atmdev_ops atmarpd_dev_ops = {
        .close = atmarpd_close
 };
@@ -711,7 +680,7 @@ static struct atm_dev atmarpd_dev = {
        .ops =                  &atmarpd_dev_ops,
        .type =                 "arpd",
        .number =               999,
-       .lock =                 SPIN_LOCK_UNLOCKED
+       .lock =                 __SPIN_LOCK_UNLOCKED(atmarpd_dev.lock)
 };
 
 
@@ -723,11 +692,11 @@ static int atm_init_atmarp(struct atm_vcc *vcc)
                return -EADDRINUSE;
        }
 
-       mod_timer(&idle_timer, jiffies+CLIP_CHECK_INTERVAL*HZ);
+       mod_timer(&idle_timer, jiffies + CLIP_CHECK_INTERVAL * HZ);
 
        atmarpd = vcc;
-       set_bit(ATM_VF_META,&vcc->flags);
-       set_bit(ATM_VF_READY,&vcc->flags);
+       set_bit(ATM_VF_META, &vcc->flags);
+       set_bit(ATM_VF_READY, &vcc->flags);
            /* allow replies and avoid getting closed if signaling dies */
        vcc->dev = &atmarpd_dev;
        vcc_insert_socket(sk_atm(vcc));
@@ -840,8 +809,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';
@@ -917,6 +886,8 @@ static void *clip_seq_sub_iter(struct neigh_seq_state *_state,
 
 static void *clip_seq_start(struct seq_file *seq, loff_t * pos)
 {
+       struct clip_seq_state *state = seq->private;
+       state->ns.neigh_sub_iter = clip_seq_sub_iter;
        return neigh_seq_start(seq, pos, &clip_tbl, NEIGH_SEQ_NEIGH_ONLY);
 }
 
@@ -937,7 +908,7 @@ static int clip_seq_show(struct seq_file *seq, void *v)
        return 0;
 }
 
-static struct seq_operations arp_seq_ops = {
+static const struct seq_operations arp_seq_ops = {
        .start  = clip_seq_start,
        .next   = neigh_seq_next,
        .stop   = neigh_seq_stop,
@@ -946,40 +917,21 @@ static struct seq_operations arp_seq_ops = {
 
 static int arp_seq_open(struct inode *inode, struct file *file)
 {
-       struct clip_seq_state *state;
-       struct seq_file *seq;
-       int rc = -EAGAIN;
-
-       state = kzalloc(sizeof(*state), GFP_KERNEL);
-       if (!state) {
-               rc = -ENOMEM;
-               goto out_kfree;
-       }
-       state->ns.neigh_sub_iter = clip_seq_sub_iter;
-
-       rc = seq_open(file, &arp_seq_ops);
-       if (rc)
-               goto out_kfree;
-
-       seq = file->private_data;
-       seq->private = state;
-out:
-       return rc;
-
-out_kfree:
-       kfree(state);
-       goto out;
+       return seq_open_net(inode, file, &arp_seq_ops,
+                           sizeof(struct clip_seq_state));
 }
 
 static const struct file_operations arp_seq_fops = {
        .open           = arp_seq_open,
        .read           = seq_read,
        .llseek         = seq_lseek,
-       .release        = seq_release_private,
+       .release        = seq_release_net,
        .owner          = THIS_MODULE
 };
 #endif
 
+static void atm_clip_exit_noproc(void);
+
 static int __init atm_clip_init(void)
 {
        neigh_table_init_no_netlink(&clip_tbl);
@@ -995,21 +947,22 @@ static int __init atm_clip_init(void)
        {
                struct proc_dir_entry *p;
 
-               p = create_proc_entry("arp", S_IRUGO, atm_proc_root);
-               if (p)
-                       p->proc_fops = &arp_seq_fops;
+               p = proc_create("arp", S_IRUGO, atm_proc_root, &arp_seq_fops);
+               if (!p) {
+                       pr_err("Unable to initialize /proc/net/atm/arp\n");
+                       atm_clip_exit_noproc();
+                       return -ENOMEM;
+               }
        }
 #endif
 
        return 0;
 }
 
-static void __exit atm_clip_exit(void)
+static void atm_clip_exit_noproc(void)
 {
        struct net_device *dev, *next;
 
-       remove_proc_entry("arp", atm_proc_root);
-
        unregister_inetaddr_notifier(&clip_inet_notifier);
        unregister_netdevice_notifier(&clip_dev_notifier);
 
@@ -1040,6 +993,13 @@ static void __exit atm_clip_exit(void)
        clip_tbl_hook = NULL;
 }
 
+static void __exit atm_clip_exit(void)
+{
+       remove_proc_entry("arp", atm_proc_root);
+
+       atm_clip_exit_noproc();
+}
+
 module_init(atm_clip_init);
 module_exit(atm_clip_exit);
 MODULE_AUTHOR("Werner Almesberger");