1 files changed, 42 insertions, 45 deletions

diff --git a/net/atm/clip.c b/net/atm/clip.c
index 64629c354343..313aba11316b 100644
--- a/net/atm/clip.c
+++ b/net/atm/clip.c
@@ -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 */
@@ -28,12 +30,13 @@
 #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"
@@ -51,13 +54,13 @@ static int to_atmarpd(enum atmarp_ctrl_type type, int itf, __be32 ip)
         struct atmarp_ctrl *ctrl;
         struct sk_buff *skb;
 
-        pr_debug("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;
@@ -71,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)
 {
-        pr_debug("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;
@@ -86,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() */
@@ -106,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);
 }
 
@@ -127,7 +127,7 @@ static int neigh_check_cb(struct neighbour *n)
 
                 if (cv->idle_timeout && time_after(jiffies, exp)) {
                         pr_debug("releasing vcc %p->%p of entry %p\n",
-                                cv, cv->vcc, entry);
+                                 cv, cv->vcc, entry);
                         vcc_release_async(cv->vcc, -ETIMEDOUT);
                 }
         }
@@ -139,7 +139,7 @@ static int neigh_check_cb(struct neighbour *n)
                 struct sk_buff *skb;
 
                 pr_debug("destruction postponed with ref %d\n",
-                        atomic_read(&n->refcnt));
+                         atomic_read(&n->refcnt));
 
                 while ((skb = skb_dequeue(&n->arp_queue)) != NULL)
                         dev_kfree_skb(skb);
@@ -163,7 +163,7 @@ static int clip_arp_rcv(struct sk_buff *skb)
 {
         struct atm_vcc *vcc;
 
-        pr_debug("clip_arp_rcv\n");
+        pr_debug("\n");
         vcc = ATM_SKB(skb)->vcc;
         if (!vcc || !atm_charge(vcc, skb->truesize)) {
                 dev_kfree_skb_any(skb);
@@ -188,7 +188,7 @@ static void clip_push(struct atm_vcc *vcc, struct sk_buff *skb)
 {
         struct clip_vcc *clip_vcc = CLIP_VCC(vcc);
 
-        pr_debug("clip push\n");
+        pr_debug("\n");
         if (!skb) {
                 pr_debug("removing VCC %p\n", clip_vcc);
                 if (clip_vcc->entry)
@@ -206,12 +206,12 @@ static void clip_push(struct atm_vcc *vcc, struct sk_buff *skb)
         }
         ATM_SKB(skb)->vcc = vcc;
         skb_reset_mac_header(skb);
-        if (!clip_vcc->encap
-            || skb->len < RFC1483LLC_LEN
-            || memcmp(skb->data, llc_oui, sizeof (llc_oui)))
+        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)) {
                         skb->dev->stats.rx_packets++;
@@ -239,7 +239,7 @@ static void clip_pop(struct atm_vcc *vcc, struct sk_buff *skb)
         int old;
         unsigned long flags;
 
-        pr_debug("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)
@@ -255,7 +255,7 @@ static void clip_pop(struct atm_vcc *vcc, struct sk_buff *skb)
 
 static void clip_neigh_solicit(struct neighbour *neigh, struct sk_buff *skb)
 {
-        pr_debug("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);
 }
 
@@ -284,7 +284,7 @@ static int clip_constructor(struct neighbour *neigh)
         struct in_device *in_dev;
         struct neigh_parms *parms;
 
-        pr_debug("clip_constructor (neigh %p, entry %p)\n", neigh, entry);
+        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;
@@ -369,9 +369,9 @@ static netdev_tx_t clip_start_xmit(struct sk_buff *skb,
         int old;
         unsigned long flags;
 
-        pr_debug("clip_start_xmit (skb %p)\n", skb);
+        pr_debug("(skb %p)\n", skb);
         if (!skb_dst(skb)) {
-                printk(KERN_ERR "clip_start_xmit: skb_dst(skb) == NULL\n");
+                pr_err("skb_dst(skb) == NULL\n");
                 dev_kfree_skb(skb);
                 dev->stats.tx_dropped++;
                 return NETDEV_TX_OK;
@@ -385,7 +385,7 @@ static netdev_tx_t clip_start_xmit(struct sk_buff *skb,
                         return 0;
                 }
 #endif
-                printk(KERN_ERR "clip_start_xmit: NO NEIGHBOUR !\n");
+                pr_err("NO NEIGHBOUR !\n");
                 dev_kfree_skb(skb);
                 dev->stats.tx_dropped++;
                 return NETDEV_TX_OK;
@@ -421,7 +421,7 @@ static netdev_tx_t clip_start_xmit(struct sk_buff *skb,
         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");
+                pr_warning("XOFF->XOFF transition\n");
                 return NETDEV_TX_OK;
         }
         dev->stats.tx_packets++;
@@ -456,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;
-        pr_debug("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);
@@ -506,16 +506,16 @@ static int clip_setentry(struct atm_vcc *vcc, __be32 ip)
         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;
                 }
-                pr_debug("setentry: remove\n");
+                pr_debug("remove\n");
                 unlink_clip_vcc(clip_vcc);
                 return 0;
         }
@@ -529,9 +529,9 @@ static int clip_setentry(struct atm_vcc *vcc, __be32 ip)
         entry = NEIGH2ENTRY(neigh);
         if (entry != clip_vcc->entry) {
                 if (!clip_vcc->entry)
-                        pr_debug("setentry: add\n");
+                        pr_debug("add\n");
                 else {
-                        pr_debug("setentry: update\n");
+                        pr_debug("update\n");
                         unlink_clip_vcc(clip_vcc);
                 }
                 link_vcc(clip_vcc, entry);
@@ -614,16 +614,16 @@ static int clip_device_event(struct notifier_block *this, unsigned long event,
 
         switch (event) {
         case NETDEV_UP:
-                pr_debug("clip_device_event NETDEV_UP\n");
+                pr_debug("NETDEV_UP\n");
                 to_atmarpd(act_up, PRIV(dev)->number, 0);
                 break;
         case NETDEV_GOING_DOWN:
-                pr_debug("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:
-                pr_debug("clip_device_event NETDEV_CHANGE*\n");
+                pr_debug("NETDEV_CHANGE*\n");
                 to_atmarpd(act_change, PRIV(dev)->number, 0);
                 break;
         }
@@ -645,7 +645,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,
 };
@@ -660,7 +659,7 @@ static struct notifier_block clip_inet_notifier = {
 
 static void atmarpd_close(struct atm_vcc *vcc)
 {
-        pr_debug("atmarpd_close\n");
+        pr_debug("\n");
 
         rtnl_lock();
         atmarpd = NULL;
@@ -671,7 +670,6 @@ static void atmarpd_close(struct atm_vcc *vcc)
         module_put(THIS_MODULE);
 }
 
-
 static struct atmdev_ops atmarpd_dev_ops = {
         .close = atmarpd_close
 };
@@ -693,11 +691,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));
@@ -950,8 +948,7 @@ static int __init atm_clip_init(void)
 
                 p = proc_create("arp", S_IRUGO, atm_proc_root, &arp_seq_fops);
                 if (!p) {
-                        printk(KERN_ERR "Unable to initialize "
-                               "/proc/net/atm/arp\n");
+                        pr_err("Unable to initialize /proc/net/atm/arp\n");
                         atm_clip_exit_noproc();
                         return -ENOMEM;
                 }