Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 285 insertions, 325 deletions

diff --git a/net/atm/lec.c b/net/atm/lec.c
index b2d644560323..feeaf5718472 100644
--- a/net/atm/lec.c
+++ b/net/atm/lec.c
@@ -4,6 +4,9 @@
  * Marko Kiiskila <mkiiskila@yahoo.com>
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ":%s: " fmt, __func__
+
+#include <linux/slab.h>
 #include <linux/kernel.h>
 #include <linux/bitops.h>
 #include <linux/capability.h>
@@ -16,7 +19,7 @@
 #include <linux/skbuff.h>
 #include <linux/ip.h>
 #include <asm/byteorder.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 #include <net/arp.h>
 #include <net/dst.h>
 #include <linux/proc_fs.h>
@@ -62,7 +65,6 @@ static int lec_open(struct net_device *dev);
 static netdev_tx_t lec_start_xmit(struct sk_buff *skb,
                                   struct net_device *dev);
 static int lec_close(struct net_device *dev);
-static void lec_init(struct net_device *dev);
 static struct lec_arp_table *lec_arp_find(struct lec_priv *priv,
                                           const unsigned char *mac_addr);
 static int lec_arp_remove(struct lec_priv *priv,
@@ -86,17 +88,19 @@ static struct atm_vcc *lec_arp_resolve(struct lec_priv *priv,
                                        int is_rdesc,
                                        struct lec_arp_table **ret_entry);
 static void lec_arp_update(struct lec_priv *priv, const unsigned char *mac_addr,
-                           const unsigned char *atm_addr, unsigned long remoteflag,
+                           const unsigned char *atm_addr,
+                           unsigned long remoteflag,
                            unsigned int targetless_le_arp);
 static void lec_flush_complete(struct lec_priv *priv, unsigned long tran_id);
 static int lec_mcast_make(struct lec_priv *priv, struct atm_vcc *vcc);
 static void lec_set_flush_tran_id(struct lec_priv *priv,
                                   const unsigned char *atm_addr,
                                   unsigned long tran_id);
-static void lec_vcc_added(struct lec_priv *priv, const struct atmlec_ioc *ioc_data,
+static void lec_vcc_added(struct lec_priv *priv,
+                          const struct atmlec_ioc *ioc_data,
                           struct atm_vcc *vcc,
-                          void (*old_push) (struct atm_vcc *vcc,
-                                            struct sk_buff *skb));
+                          void (*old_push)(struct atm_vcc *vcc,
+                                           struct sk_buff *skb));
 static void lec_vcc_close(struct lec_priv *priv, struct atm_vcc *vcc);
 
 /* must be done under lec_arp_lock */
@@ -111,7 +115,6 @@ static inline void lec_arp_put(struct lec_arp_table *entry)
                 kfree(entry);
 }
 
-
 static struct lane2_ops lane2_ops = {
         lane2_resolve,          /* resolve,             spec 3.1.3 */
         lane2_associate_req,    /* associate_req,       spec 3.1.4 */
@@ -149,7 +152,8 @@ static void lec_handle_bridge(struct sk_buff *skb, struct net_device *dev)
                 mesg = (struct atmlec_msg *)skb2->data;
                 mesg->type = l_topology_change;
                 buff += 4;
-                mesg->content.normal.flag = *buff & 0x01;       /* 0x01 is topology change */
+                mesg->content.normal.flag = *buff & 0x01;
+                                        /* 0x01 is topology change */
 
                 priv = netdev_priv(dev);
                 atm_force_charge(priv->lecd, skb2->truesize);
@@ -243,7 +247,7 @@ lec_send(struct atm_vcc *vcc, struct sk_buff *skb)
 
 static void lec_tx_timeout(struct net_device *dev)
 {
-        printk(KERN_INFO "%s: tx timeout\n", dev->name);
+        pr_info("%s\n", dev->name);
         dev->trans_start = jiffies;
         netif_wake_queue(dev);
 }
@@ -262,14 +266,10 @@ static netdev_tx_t lec_start_xmit(struct sk_buff *skb,
         unsigned char rdesc[ETH_ALEN];  /* Token Ring route descriptor */
 #endif
         int is_rdesc;
-#if DUMP_PACKETS > 0
-        char buf[300];
-        int i = 0;
-#endif /* DUMP_PACKETS >0 */
 
-        pr_debug("lec_start_xmit called\n");
+        pr_debug("called\n");
         if (!priv->lecd) {
-                printk("%s:No lecd attached\n", dev->name);
+                pr_info("%s:No lecd attached\n", dev->name);
                 dev->stats.tx_errors++;
                 netif_stop_queue(dev);
                 kfree_skb(skb);
@@ -277,8 +277,8 @@ static netdev_tx_t lec_start_xmit(struct sk_buff *skb,
         }
 
         pr_debug("skbuff head:%lx data:%lx tail:%lx end:%lx\n",
-                (long)skb->head, (long)skb->data, (long)skb_tail_pointer(skb),
-                (long)skb_end_pointer(skb));
+                 (long)skb->head, (long)skb->data, (long)skb_tail_pointer(skb),
+                 (long)skb_end_pointer(skb));
 #if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)
         if (memcmp(skb->data, bridge_ula_lec, sizeof(bridge_ula_lec)) == 0)
                 lec_handle_bridge(skb, dev);
@@ -286,8 +286,7 @@ static netdev_tx_t lec_start_xmit(struct sk_buff *skb,
 
         /* Make sure we have room for lec_id */
         if (skb_headroom(skb) < 2) {
-
-                pr_debug("lec_start_xmit: reallocating skb\n");
+                pr_debug("reallocating skb\n");
                 skb2 = skb_realloc_headroom(skb, LEC_HEADER_LEN);
                 kfree_skb(skb);
                 if (skb2 == NULL)
@@ -314,23 +313,17 @@ static netdev_tx_t lec_start_xmit(struct sk_buff *skb,
         }
 #endif
 
-#if DUMP_PACKETS > 0
-        printk("%s: send datalen:%ld lecid:%4.4x\n", dev->name,
-               skb->len, priv->lecid);
 #if DUMP_PACKETS >= 2
-        for (i = 0; i < skb->len && i < 99; i++) {
-                sprintf(buf + i * 3, "%2.2x ", 0xff & skb->data[i]);
-        }
+#define MAX_DUMP_SKB 99
 #elif DUMP_PACKETS >= 1
-        for (i = 0; i < skb->len && i < 30; i++) {
-                sprintf(buf + i * 3, "%2.2x ", 0xff & skb->data[i]);
-        }
+#define MAX_DUMP_SKB 30
+#endif
+#if DUMP_PACKETS >= 1
+        printk(KERN_DEBUG "%s: send datalen:%ld lecid:%4.4x\n",
+               dev->name, skb->len, priv->lecid);
+        print_hex_dump(KERN_DEBUG, "", DUMP_OFFSET, 16, 1,
+                       skb->data, min(skb->len, MAX_DUMP_SKB), true);
 #endif /* DUMP_PACKETS >= 1 */
-        if (i == skb->len)
-                printk("%s\n", buf);
-        else
-                printk("%s...\n", buf);
-#endif /* DUMP_PACKETS > 0 */
 
         /* Minimum ethernet-frame size */
 #ifdef CONFIG_TR
@@ -368,31 +361,28 @@ static netdev_tx_t lec_start_xmit(struct sk_buff *skb,
 #endif
         entry = NULL;
         vcc = lec_arp_resolve(priv, dst, is_rdesc, &entry);
-        pr_debug("%s:vcc:%p vcc_flags:%lx, entry:%p\n", dev->name,
-                vcc, vcc ? vcc->flags : 0, entry);
+        pr_debug("%s:vcc:%p vcc_flags:%lx, entry:%p\n",
+                 dev->name, vcc, vcc ? vcc->flags : 0, entry);
         if (!vcc || !test_bit(ATM_VF_READY, &vcc->flags)) {
                 if (entry && (entry->tx_wait.qlen < LEC_UNRES_QUE_LEN)) {
-                        pr_debug("%s:lec_start_xmit: queuing packet, ",
-                                dev->name);
-                        pr_debug("MAC address %pM\n", lec_h->h_dest);
+                        pr_debug("%s:queuing packet, MAC address %pM\n",
+                                 dev->name, 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 %pM\n", lec_h->h_dest);
+                        pr_debug("%s:tx queue full or no arp entry, dropping, MAC address: %pM\n",
+                                 dev->name, lec_h->h_dest);
                         dev->stats.tx_dropped++;
                         dev_kfree_skb(skb);
                 }
                 goto out;
         }
 #if DUMP_PACKETS > 0
-        printk("%s:sending to vpi:%d vci:%d\n", dev->name, vcc->vpi, vcc->vci);
+        printk(KERN_DEBUG "%s:sending to vpi:%d vci:%d\n",
+               dev->name, vcc->vpi, vcc->vci);
 #endif /* DUMP_PACKETS > 0 */
 
         while (entry && (skb2 = skb_dequeue(&entry->tx_wait))) {
-                pr_debug("lec.c: emptying tx queue, ");
-                pr_debug("MAC address %pM\n", lec_h->h_dest);
+                pr_debug("emptying tx queue, MAC address %pM\n", lec_h->h_dest);
                 lec_send(vcc, skb2);
         }
 
@@ -445,14 +435,12 @@ static int lec_atm_send(struct atm_vcc *vcc, struct sk_buff *skb)
         pr_debug("%s: msg from zeppelin:%d\n", dev->name, mesg->type);
         switch (mesg->type) {
         case l_set_mac_addr:
-                for (i = 0; i < 6; i++) {
+                for (i = 0; i < 6; i++)
                         dev->dev_addr[i] = mesg->content.normal.mac_addr[i];
-                }
                 break;
         case l_del_mac_addr:
-                for (i = 0; i < 6; i++) {
+                for (i = 0; i < 6; i++)
                         dev->dev_addr[i] = 0;
-                }
                 break;
         case l_addr_delete:
                 lec_addr_delete(priv, mesg->content.normal.atm_addr,
@@ -478,10 +466,10 @@ static int lec_atm_send(struct atm_vcc *vcc, struct sk_buff *skb)
                                mesg->content.normal.atm_addr,
                                mesg->content.normal.flag,
                                mesg->content.normal.targetless_le_arp);
-                pr_debug("lec: in l_arp_update\n");
+                pr_debug("in l_arp_update\n");
                 if (mesg->sizeoftlvs != 0) {    /* LANE2 3.1.5 */
-                        pr_debug("lec: LANE2 3.1.5, got tlvs, size %d\n",
-                                mesg->sizeoftlvs);
+                        pr_debug("LANE2 3.1.5, got tlvs, size %d\n",
+                                 mesg->sizeoftlvs);
                         lane2_associate_ind(dev, mesg->content.normal.mac_addr,
                                             tmp, mesg->sizeoftlvs);
                 }
@@ -500,13 +488,14 @@ static int lec_atm_send(struct atm_vcc *vcc, struct sk_buff *skb)
                 priv->flush_timeout = (mesg->content.config.flush_timeout * HZ);
                 priv->path_switching_delay =
                     (mesg->content.config.path_switching_delay * HZ);
-                priv->lane_version = mesg->content.config.lane_version; /* LANE2 */
+                priv->lane_version = mesg->content.config.lane_version;
+                                        /* LANE2 */
                 priv->lane2_ops = NULL;
                 if (priv->lane_version > 1)
                         priv->lane2_ops = &lane2_ops;
                 if (dev_set_mtu(dev, mesg->content.config.mtu))
-                        printk("%s: change_mtu to %d failed\n", dev->name,
-                               mesg->content.config.mtu);
+                        pr_info("%s: change_mtu to %d failed\n",
+                                dev->name, mesg->content.config.mtu);
                 priv->is_proxy = mesg->content.config.is_proxy;
                 break;
         case l_flush_tran_id:
@@ -519,40 +508,35 @@ static int lec_atm_send(struct atm_vcc *vcc, struct sk_buff *skb)
                 break;
         case l_should_bridge:
 #if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)
-                {
-                        pr_debug("%s: bridge zeppelin asks about %pM\n",
-                                 dev->name, mesg->content.proxy.mac_addr);
+        {
+                pr_debug("%s: bridge zeppelin asks about %pM\n",
+                         dev->name, mesg->content.proxy.mac_addr);
 
-                        if (br_fdb_test_addr_hook == NULL)
-                                break;
+                if (br_fdb_test_addr_hook == NULL)
+                        break;
 
-                        if (br_fdb_test_addr_hook(dev,
-                                        mesg->content.proxy.mac_addr)) {
-                                /* hit from bridge table, send LE_ARP_RESPONSE */
-                                struct sk_buff *skb2;
-                                struct sock *sk;
-
-                                pr_debug
-                                    ("%s: entry found, responding to zeppelin\n",
-                                     dev->name);
-                                skb2 =
-                                    alloc_skb(sizeof(struct atmlec_msg),
-                                              GFP_ATOMIC);
-                                if (skb2 == NULL)
-                                        break;
-                                skb2->len = sizeof(struct atmlec_msg);
-                                skb_copy_to_linear_data(skb2, mesg,
-                                                        sizeof(*mesg));
-                                atm_force_charge(priv->lecd, skb2->truesize);
-                                sk = sk_atm(priv->lecd);
-                                skb_queue_tail(&sk->sk_receive_queue, skb2);
-                                sk->sk_data_ready(sk, skb2->len);
-                        }
+                if (br_fdb_test_addr_hook(dev, mesg->content.proxy.mac_addr)) {
+                        /* hit from bridge table, send LE_ARP_RESPONSE */
+                        struct sk_buff *skb2;
+                        struct sock *sk;
+
+                        pr_debug("%s: entry found, responding to zeppelin\n",
+                                 dev->name);
+                        skb2 = alloc_skb(sizeof(struct atmlec_msg), GFP_ATOMIC);
+                        if (skb2 == NULL)
+                                break;
+                        skb2->len = sizeof(struct atmlec_msg);
+                        skb_copy_to_linear_data(skb2, mesg, sizeof(*mesg));
+                        atm_force_charge(priv->lecd, skb2->truesize);
+                        sk = sk_atm(priv->lecd);
+                        skb_queue_tail(&sk->sk_receive_queue, skb2);
+                        sk->sk_data_ready(sk, skb2->len);
                 }
+        }
 #endif /* defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE) */
                 break;
         default:
-                printk("%s: Unknown message type %d\n", dev->name, mesg->type);
+                pr_info("%s: Unknown message type %d\n", dev->name, mesg->type);
                 dev_kfree_skb(skb);
                 return -EINVAL;
         }
@@ -573,14 +557,13 @@ static void lec_atm_close(struct atm_vcc *vcc)
         lec_arp_destroy(priv);
 
         if (skb_peek(&sk_atm(vcc)->sk_receive_queue))
-                printk("%s lec_atm_close: closing with messages pending\n",
-                       dev->name);
-        while ((skb = skb_dequeue(&sk_atm(vcc)->sk_receive_queue)) != NULL) {
+                pr_info("%s closing with messages pending\n", dev->name);
+        while ((skb = skb_dequeue(&sk_atm(vcc)->sk_receive_queue))) {
                 atm_return(vcc, skb->truesize);
                 dev_kfree_skb(skb);
         }
 
-        printk("%s: Shut down!\n", dev->name);
+        pr_info("%s: Shut down!\n", dev->name);
         module_put(THIS_MODULE);
 }
 
@@ -609,9 +592,8 @@ send_to_lecd(struct lec_priv *priv, atmlec_msg_type type,
         struct sk_buff *skb;
         struct atmlec_msg *mesg;
 
-        if (!priv || !priv->lecd) {
+        if (!priv || !priv->lecd)
                 return -1;
-        }
         skb = alloc_skb(sizeof(struct atmlec_msg), GFP_ATOMIC);
         if (!skb)
                 return -1;
@@ -634,7 +616,7 @@ send_to_lecd(struct lec_priv *priv, atmlec_msg_type type,
         sk->sk_data_ready(sk, skb->len);
 
         if (data != NULL) {
-                pr_debug("lec: about to send %d bytes of data\n", data->len);
+                pr_debug("about to send %d bytes of data\n", data->len);
                 atm_force_charge(priv->lecd, data->truesize);
                 skb_queue_tail(&sk->sk_receive_queue, data);
                 sk->sk_data_ready(sk, skb->len);
@@ -670,13 +652,6 @@ static const struct net_device_ops lec_netdev_ops = {
         .ndo_set_multicast_list = lec_set_multicast_list,
 };
 
-
-static void lec_init(struct net_device *dev)
-{
-        dev->netdev_ops = &lec_netdev_ops;
-        printk("%s: Initialized!\n", dev->name);
-}
-
 static const unsigned char lec_ctrl_magic[] = {
         0xff,
         0x00,
@@ -699,36 +674,28 @@ static void lec_push(struct atm_vcc *vcc, struct sk_buff *skb)
         struct net_device *dev = (struct net_device *)vcc->proto_data;
         struct lec_priv *priv = netdev_priv(dev);
 
-#if DUMP_PACKETS >0
-        int i = 0;
-        char buf[300];
-
-        printk("%s: lec_push vcc vpi:%d vci:%d\n", dev->name,
-               vcc->vpi, vcc->vci);
+#if DUMP_PACKETS > 0
+        printk(KERN_DEBUG "%s: vcc vpi:%d vci:%d\n",
+               dev->name, vcc->vpi, vcc->vci);
 #endif
         if (!skb) {
                 pr_debug("%s: null skb\n", dev->name);
                 lec_vcc_close(priv, vcc);
                 return;
         }
-#if DUMP_PACKETS > 0
-        printk("%s: rcv datalen:%ld lecid:%4.4x\n", dev->name,
-               skb->len, priv->lecid);
 #if DUMP_PACKETS >= 2
-        for (i = 0; i < skb->len && i < 99; i++) {
-                sprintf(buf + i * 3, "%2.2x ", 0xff & skb->data[i]);
-        }
+#define MAX_SKB_DUMP 99
 #elif DUMP_PACKETS >= 1
-        for (i = 0; i < skb->len && i < 30; i++) {
-                sprintf(buf + i * 3, "%2.2x ", 0xff & skb->data[i]);
-        }
-#endif /* DUMP_PACKETS >= 1 */
-        if (i == skb->len)
-                printk("%s\n", buf);
-        else
-                printk("%s...\n", buf);
+#define MAX_SKB_DUMP 30
+#endif
+#if DUMP_PACKETS > 0
+        printk(KERN_DEBUG "%s: rcv datalen:%ld lecid:%4.4x\n",
+               dev->name, skb->len, priv->lecid);
+        print_hex_dump(KERN_DEBUG, "", DUMP_OFFSET, 16, 1,
+                       skb->data, min(MAX_SKB_DUMP, skb->len), true);
 #endif /* DUMP_PACKETS > 0 */
-        if (memcmp(skb->data, lec_ctrl_magic, 4) == 0) {        /* Control frame, to daemon */
+        if (memcmp(skb->data, lec_ctrl_magic, 4) == 0) {
+                                /* Control frame, to daemon */
                 struct sock *sk = sk_atm(vcc);
 
                 pr_debug("%s: To daemon\n", dev->name);
@@ -786,9 +753,8 @@ static void lec_push(struct atm_vcc *vcc, struct sk_buff *skb)
                         dev_kfree_skb(skb);
                         return;
                 }
-                if (!hlist_empty(&priv->lec_arp_empty_ones)) {
+                if (!hlist_empty(&priv->lec_arp_empty_ones))
                         lec_arp_check_empties(priv, vcc, skb);
-                }
                 skb_pull(skb, 2);       /* skip lec_id */
 #ifdef CONFIG_TR
                 if (priv->is_trdev)
@@ -809,7 +775,7 @@ static void lec_pop(struct atm_vcc *vcc, struct sk_buff *skb)
         struct net_device *dev = skb->dev;
 
         if (vpriv == NULL) {
-                printk("lec_pop(): vpriv = NULL!?!?!?\n");
+                pr_info("vpriv = NULL!?!?!?\n");
                 return;
         }
 
@@ -830,15 +796,13 @@ static int lec_vcc_attach(struct atm_vcc *vcc, void __user *arg)
 
         /* Lecd must be up in this case */
         bytes_left = copy_from_user(&ioc_data, arg, sizeof(struct atmlec_ioc));
-        if (bytes_left != 0) {
-                printk
-                    ("lec: lec_vcc_attach, copy from user failed for %d bytes\n",
-                     bytes_left);
-        }
+        if (bytes_left != 0)
+                pr_info("copy from user failed for %d bytes\n", bytes_left);
         if (ioc_data.dev_num < 0 || ioc_data.dev_num >= MAX_LEC_ITF ||
             !dev_lec[ioc_data.dev_num])
                 return -EINVAL;
-        if (!(vpriv = kmalloc(sizeof(struct lec_vcc_priv), GFP_KERNEL)))
+        vpriv = kmalloc(sizeof(struct lec_vcc_priv), GFP_KERNEL);
+        if (!vpriv)
                 return -ENOMEM;
         vpriv->xoff = 0;
         vpriv->old_pop = vcc->pop;
@@ -893,6 +857,7 @@ static int lecd_attach(struct atm_vcc *vcc, int arg)
                         dev_lec[i] = alloc_etherdev(size);
                 if (!dev_lec[i])
                         return -ENOMEM;
+                dev_lec[i]->netdev_ops = &lec_netdev_ops;
                 snprintf(dev_lec[i]->name, IFNAMSIZ, "lec%d", i);
                 if (register_netdev(dev_lec[i])) {
                         free_netdev(dev_lec[i]);
@@ -901,7 +866,6 @@ static int lecd_attach(struct atm_vcc *vcc, int arg)
 
                 priv = netdev_priv(dev_lec[i]);
                 priv->is_trdev = is_trdev;
-                lec_init(dev_lec[i]);
         } else {
                 priv = netdev_priv(dev_lec[i]);
                 if (priv->lecd)
@@ -929,9 +893,8 @@ static int lecd_attach(struct atm_vcc *vcc, int arg)
         priv->flush_timeout = (4 * HZ);
         priv->path_switching_delay = (6 * HZ);
 
-        if (dev_lec[i]->flags & IFF_UP) {
+        if (dev_lec[i]->flags & IFF_UP)
                 netif_start_queue(dev_lec[i]);
-        }
         __module_get(THIS_MODULE);
         return i;
 }
@@ -1133,7 +1096,9 @@ static int lec_seq_show(struct seq_file *seq, void *v)
         else {
                 struct lec_state *state = seq->private;
                 struct net_device *dev = state->dev;
-                struct lec_arp_table *entry = hlist_entry(state->node, struct lec_arp_table, next);
+                struct lec_arp_table *entry = hlist_entry(state->node,
+                                                          struct lec_arp_table,
+                                                          next);
 
                 seq_printf(seq, "%s ", dev->name);
                 lec_info(seq, entry);
@@ -1207,13 +1172,13 @@ static int __init lane_module_init(void)
 
         p = proc_create("lec", S_IRUGO, atm_proc_root, &lec_seq_fops);
         if (!p) {
-                printk(KERN_ERR "Unable to initialize /proc/net/atm/lec\n");
+                pr_err("Unable to initialize /proc/net/atm/lec\n");
                 return -ENOMEM;
         }
 #endif
 
         register_atm_ioctl(&lane_ioctl_ops);
-        printk("lec.c: " __DATE__ " " __TIME__ " initialized\n");
+        pr_info("lec.c: " __DATE__ " " __TIME__ " initialized\n");
         return 0;
 }
 
@@ -1302,13 +1267,13 @@ static int lane2_associate_req(struct net_device *dev, const u8 *lan_dst,
         struct lec_priv *priv = netdev_priv(dev);
 
         if (compare_ether_addr(lan_dst, dev->dev_addr))
-                return (0);     /* not our mac address */
+                return 0;       /* not our mac address */
 
         kfree(priv->tlvs);      /* NULL if there was no previous association */
 
         priv->tlvs = kmemdup(tlvs, sizeoftlvs, GFP_KERNEL);
         if (priv->tlvs == NULL)
-                return (0);
+                return 0;
         priv->sizeoftlvs = sizeoftlvs;
 
         skb = alloc_skb(sizeoftlvs, GFP_ATOMIC);
@@ -1318,12 +1283,12 @@ static int lane2_associate_req(struct net_device *dev, const u8 *lan_dst,
         skb_copy_to_linear_data(skb, tlvs, sizeoftlvs);
         retval = send_to_lecd(priv, l_associate_req, NULL, NULL, skb);
         if (retval != 0)
-                printk("lec.c: lane2_associate_req() failed\n");
+                pr_info("lec.c: lane2_associate_req() failed\n");
         /*
          * If the previous association has changed we must
          * somehow notify other LANE entities about the change
          */
-        return (1);
+        return 1;
 }
 
 /*
@@ -1356,12 +1321,12 @@ static void lane2_associate_ind(struct net_device *dev, const u8 *mac_addr,
         entry->sizeoftlvs = sizeoftlvs;
 #endif
 #if 0
-        printk("lec.c: lane2_associate_ind()\n");
-        printk("dump of tlvs, sizeoftlvs=%d\n", sizeoftlvs);
+        pr_info("\n");
+        pr_info("dump of tlvs, sizeoftlvs=%d\n", sizeoftlvs);
         while (i < sizeoftlvs)
-                printk("%02x ", tlvs[i++]);
+                pr_cont("%02x ", tlvs[i++]);
 
-        printk("\n");
+        pr_cont("\n");
 #endif
 
         /* tell MPOA about the TLVs we saw */
@@ -1381,15 +1346,15 @@ static void lane2_associate_ind(struct net_device *dev, const u8 *mac_addr,
 
 #include <linux/types.h>
 #include <linux/timer.h>
-#include <asm/param.h>
+#include <linux/param.h>
 #include <asm/atomic.h>
 #include <linux/inetdevice.h>
 #include <net/route.h>
 
 #if 0
-#define pr_debug(format,args...)
+#define pr_debug(format, args...)
 /*
-#define pr_debug printk
+  #define pr_debug printk
 */
 #endif
 #define DEBUG_ARP_TABLE 0
@@ -1403,7 +1368,7 @@ static void lec_arp_expire_arp(unsigned long data);
  * Arp table funcs
  */
 
-#define HASH(ch) (ch & (LEC_ARP_TABLE_SIZE -1))
+#define HASH(ch) (ch & (LEC_ARP_TABLE_SIZE - 1))
 
 /*
  * Initialization of arp-cache
@@ -1412,9 +1377,8 @@ static void lec_arp_init(struct lec_priv *priv)
 {
         unsigned short i;
 
-        for (i = 0; i < LEC_ARP_TABLE_SIZE; i++) {
+        for (i = 0; i < LEC_ARP_TABLE_SIZE; i++)
                 INIT_HLIST_HEAD(&priv->lec_arp_tables[i]);
-        }
         INIT_HLIST_HEAD(&priv->lec_arp_empty_ones);
         INIT_HLIST_HEAD(&priv->lec_no_forward);
         INIT_HLIST_HEAD(&priv->mcast_fwds);
@@ -1458,10 +1422,7 @@ lec_arp_add(struct lec_priv *priv, struct lec_arp_table *entry)
         tmp = &priv->lec_arp_tables[HASH(entry->mac_addr[ETH_ALEN - 1])];
         hlist_add_head(&entry->next, tmp);
 
-        pr_debug("LEC_ARP: Added entry:%2.2x %2.2x %2.2x %2.2x %2.2x %2.2x\n",
-                0xff & entry->mac_addr[0], 0xff & entry->mac_addr[1],
-                0xff & entry->mac_addr[2], 0xff & entry->mac_addr[3],
-                0xff & entry->mac_addr[4], 0xff & entry->mac_addr[5]);
+        pr_debug("Added entry:%pM\n", entry->mac_addr);
 }
 
 /*
@@ -1474,20 +1435,23 @@ lec_arp_remove(struct lec_priv *priv, struct lec_arp_table *to_remove)
         struct lec_arp_table *entry;
         int i, remove_vcc = 1;
 
-        if (!to_remove) {
+        if (!to_remove)
                 return -1;
-        }
 
         hlist_del(&to_remove->next);
         del_timer(&to_remove->timer);
 
-        /* If this is the only MAC connected to this VCC, also tear down the VCC */
+        /*
+         * If this is the only MAC connected to this VCC,
+         * also tear down the VCC
+         */
         if (to_remove->status >= ESI_FLUSH_PENDING) {
                 /*
                  * ESI_FLUSH_PENDING, ESI_FORWARD_DIRECT
                  */
                 for (i = 0; i < LEC_ARP_TABLE_SIZE; i++) {
-                        hlist_for_each_entry(entry, node, &priv->lec_arp_tables[i], next) {
+                        hlist_for_each_entry(entry, node,
+                                             &priv->lec_arp_tables[i], next) {
                                 if (memcmp(to_remove->atm_addr,
                                            entry->atm_addr, ATM_ESA_LEN) == 0) {
                                         remove_vcc = 0;
@@ -1500,10 +1464,7 @@ lec_arp_remove(struct lec_priv *priv, struct lec_arp_table *to_remove)
         }
         skb_queue_purge(&to_remove->tx_wait);   /* FIXME: good place for this? */
 
-        pr_debug("LEC_ARP: Removed entry:%2.2x %2.2x %2.2x %2.2x %2.2x %2.2x\n",
-                0xff & to_remove->mac_addr[0], 0xff & to_remove->mac_addr[1],
-                0xff & to_remove->mac_addr[2], 0xff & to_remove->mac_addr[3],
-                0xff & to_remove->mac_addr[4], 0xff & to_remove->mac_addr[5]);
+        pr_debug("Removed entry:%pM\n", to_remove->mac_addr);
         return 0;
 }
 
@@ -1521,9 +1482,8 @@ static const char *get_status_string(unsigned char st)
                 return "ESI_FLUSH_PENDING";
         case ESI_FORWARD_DIRECT:
                 return "ESI_FORWARD_DIRECT";
-        default:
-                return "<UNKNOWN>";
         }
+        return "<UNKNOWN>";
 }
 
 static void dump_arp_table(struct lec_priv *priv)
@@ -1533,18 +1493,15 @@ static void dump_arp_table(struct lec_priv *priv)
         char buf[256];
         int i, j, offset;
 
-        printk("Dump %p:\n", priv);
+        pr_info("Dump %p:\n", priv);
         for (i = 0; i < LEC_ARP_TABLE_SIZE; i++) {
-                hlist_for_each_entry(rulla, node, &priv->lec_arp_tables[i], next) {
+                hlist_for_each_entry(rulla, node,
+                                     &priv->lec_arp_tables[i], next) {
                         offset = 0;
                         offset += sprintf(buf, "%d: %p\n", i, rulla);
-                        offset += sprintf(buf + offset, "Mac:");
-                        for (j = 0; j < ETH_ALEN; j++) {
-                                offset += sprintf(buf + offset,
-                                                  "%2.2x ",
-                                                  rulla->mac_addr[j] & 0xff);
-                        }
-                        offset += sprintf(buf + offset, "Atm:");
+                        offset += sprintf(buf + offset, "Mac: %pM",
+                                          rulla->mac_addr);
+                        offset += sprintf(buf + offset, " Atm:");
                         for (j = 0; j < ATM_ESA_LEN; j++) {
                                 offset += sprintf(buf + offset,
                                                   "%2.2x ",
@@ -1564,20 +1521,16 @@ static void dump_arp_table(struct lec_priv *priv)
                                     "Flags:%x, Packets_flooded:%x, Status: %s ",
                                     rulla->flags, rulla->packets_flooded,
                                     get_status_string(rulla->status));
-                        printk("%s\n", buf);
+                        pr_info("%s\n", buf);
                 }
         }
 
         if (!hlist_empty(&priv->lec_no_forward))
-                printk("No forward\n");
+                pr_info("No forward\n");
         hlist_for_each_entry(rulla, node, &priv->lec_no_forward, next) {
                 offset = 0;
-                offset += sprintf(buf + offset, "Mac:");
-                for (j = 0; j < ETH_ALEN; j++) {
-                        offset += sprintf(buf + offset, "%2.2x ",
-                                          rulla->mac_addr[j] & 0xff);
-                }
-                offset += sprintf(buf + offset, "Atm:");
+                offset += sprintf(buf + offset, "Mac: %pM", rulla->mac_addr);
+                offset += sprintf(buf + offset, " Atm:");
                 for (j = 0; j < ATM_ESA_LEN; j++) {
                         offset += sprintf(buf + offset, "%2.2x ",
                                           rulla->atm_addr[j] & 0xff);
@@ -1594,19 +1547,15 @@ static void dump_arp_table(struct lec_priv *priv)
                                   "Flags:%x, Packets_flooded:%x, Status: %s ",
                                   rulla->flags, rulla->packets_flooded,
                                   get_status_string(rulla->status));
-                printk("%s\n", buf);
+                pr_info("%s\n", buf);
         }
 
         if (!hlist_empty(&priv->lec_arp_empty_ones))
-                printk("Empty ones\n");
+                pr_info("Empty ones\n");
         hlist_for_each_entry(rulla, node, &priv->lec_arp_empty_ones, next) {
                 offset = 0;
-                offset += sprintf(buf + offset, "Mac:");
-                for (j = 0; j < ETH_ALEN; j++) {
-                        offset += sprintf(buf + offset, "%2.2x ",
-                                          rulla->mac_addr[j] & 0xff);
-                }
-                offset += sprintf(buf + offset, "Atm:");
+                offset += sprintf(buf + offset, "Mac: %pM", rulla->mac_addr);
+                offset += sprintf(buf + offset, " Atm:");
                 for (j = 0; j < ATM_ESA_LEN; j++) {
                         offset += sprintf(buf + offset, "%2.2x ",
                                           rulla->atm_addr[j] & 0xff);
@@ -1623,19 +1572,15 @@ static void dump_arp_table(struct lec_priv *priv)
                                   "Flags:%x, Packets_flooded:%x, Status: %s ",
                                   rulla->flags, rulla->packets_flooded,
                                   get_status_string(rulla->status));
-                printk("%s", buf);
+                pr_info("%s", buf);
         }
 
         if (!hlist_empty(&priv->mcast_fwds))
-                printk("Multicast Forward VCCs\n");
+                pr_info("Multicast Forward VCCs\n");
         hlist_for_each_entry(rulla, node, &priv->mcast_fwds, next) {
                 offset = 0;
-                offset += sprintf(buf + offset, "Mac:");
-                for (j = 0; j < ETH_ALEN; j++) {
-                        offset += sprintf(buf + offset, "%2.2x ",
-                                          rulla->mac_addr[j] & 0xff);
-                }
-                offset += sprintf(buf + offset, "Atm:");
+                offset += sprintf(buf + offset, "Mac: %pM", rulla->mac_addr);
+                offset += sprintf(buf + offset, " Atm:");
                 for (j = 0; j < ATM_ESA_LEN; j++) {
                         offset += sprintf(buf + offset, "%2.2x ",
                                           rulla->atm_addr[j] & 0xff);
@@ -1652,7 +1597,7 @@ static void dump_arp_table(struct lec_priv *priv)
                                   "Flags:%x, Packets_flooded:%x, Status: %s ",
                                   rulla->flags, rulla->packets_flooded,
                                   get_status_string(rulla->status));
-                printk("%s\n", buf);
+                pr_info("%s\n", buf);
         }
 
 }
@@ -1678,14 +1623,16 @@ static void lec_arp_destroy(struct lec_priv *priv)
 
         spin_lock_irqsave(&priv->lec_arp_lock, flags);
         for (i = 0; i < LEC_ARP_TABLE_SIZE; i++) {
-                hlist_for_each_entry_safe(entry, node, next, &priv->lec_arp_tables[i], next) {
+                hlist_for_each_entry_safe(entry, node, next,
+                                          &priv->lec_arp_tables[i], next) {
                         lec_arp_remove(priv, entry);
                         lec_arp_put(entry);
                 }
                 INIT_HLIST_HEAD(&priv->lec_arp_tables[i]);
         }
 
-        hlist_for_each_entry_safe(entry, node, next, &priv->lec_arp_empty_ones, next) {
+        hlist_for_each_entry_safe(entry, node, next,
+                                  &priv->lec_arp_empty_ones, next) {
                 del_timer_sync(&entry->timer);
                 lec_arp_clear_vccs(entry);
                 hlist_del(&entry->next);
@@ -1693,7 +1640,8 @@ static void lec_arp_destroy(struct lec_priv *priv)
         }
         INIT_HLIST_HEAD(&priv->lec_arp_empty_ones);
 
-        hlist_for_each_entry_safe(entry, node, next, &priv->lec_no_forward, next) {
+        hlist_for_each_entry_safe(entry, node, next,
+                                  &priv->lec_no_forward, next) {
                 del_timer_sync(&entry->timer);
                 lec_arp_clear_vccs(entry);
                 hlist_del(&entry->next);
@@ -1722,15 +1670,12 @@ static struct lec_arp_table *lec_arp_find(struct lec_priv *priv,
         struct hlist_head *head;
         struct lec_arp_table *entry;
 
-        pr_debug("LEC_ARP: lec_arp_find :%2.2x %2.2x %2.2x %2.2x %2.2x %2.2x\n",
-                mac_addr[0] & 0xff, mac_addr[1] & 0xff, mac_addr[2] & 0xff,
-                mac_addr[3] & 0xff, mac_addr[4] & 0xff, mac_addr[5] & 0xff);
+        pr_debug("%pM\n", mac_addr);
 
         head = &priv->lec_arp_tables[HASH(mac_addr[ETH_ALEN - 1])];
         hlist_for_each_entry(entry, node, head, next) {
-                if (!compare_ether_addr(mac_addr, entry->mac_addr)) {
+                if (!compare_ether_addr(mac_addr, entry->mac_addr))
                         return entry;
-                }
         }
         return NULL;
 }
@@ -1742,7 +1687,7 @@ static struct lec_arp_table *make_entry(struct lec_priv *priv,
 
         to_return = kzalloc(sizeof(struct lec_arp_table), GFP_ATOMIC);
         if (!to_return) {
-                printk("LEC: Arp entry kmalloc failed\n");
+                pr_info("LEC: Arp entry kmalloc failed\n");
                 return NULL;
         }
         memcpy(to_return->mac_addr, mac_addr, ETH_ALEN);
@@ -1763,7 +1708,7 @@ static void lec_arp_expire_arp(unsigned long data)
 
         entry = (struct lec_arp_table *)data;
 
-        pr_debug("lec_arp_expire_arp\n");
+        pr_debug("\n");
         if (entry->status == ESI_ARP_PENDING) {
                 if (entry->no_tries <= entry->priv->max_retry_count) {
                         if (entry->is_rdesc)
@@ -1787,10 +1732,10 @@ static void lec_arp_expire_vcc(unsigned long data)
 
         del_timer(&to_remove->timer);
 
-        pr_debug("LEC_ARP %p %p: lec_arp_expire_vcc vpi:%d vci:%d\n",
-                to_remove, priv,
-                to_remove->vcc ? to_remove->recv_vcc->vpi : 0,
-                to_remove->vcc ? to_remove->recv_vcc->vci : 0);
+        pr_debug("%p %p: vpi:%d vci:%d\n",
+                 to_remove, priv,
+                 to_remove->vcc ? to_remove->recv_vcc->vpi : 0,
+                 to_remove->vcc ? to_remove->recv_vcc->vci : 0);
 
         spin_lock_irqsave(&priv->lec_arp_lock, flags);
         hlist_del(&to_remove->next);
@@ -1800,6 +1745,50 @@ static void lec_arp_expire_vcc(unsigned long data)
         lec_arp_put(to_remove);
 }
 
+static bool __lec_arp_check_expire(struct lec_arp_table *entry,
+                                   unsigned long now,
+                                   struct lec_priv *priv)
+{
+        unsigned long time_to_check;
+
+        if ((entry->flags) & LEC_REMOTE_FLAG && priv->topology_change)
+                time_to_check = priv->forward_delay_time;
+        else
+                time_to_check = priv->aging_time;
+
+        pr_debug("About to expire: %lx - %lx > %lx\n",
+                 now, entry->last_used, time_to_check);
+        if (time_after(now, entry->last_used + time_to_check) &&
+            !(entry->flags & LEC_PERMANENT_FLAG) &&
+            !(entry->mac_addr[0] & 0x01)) {     /* LANE2: 7.1.20 */
+                /* Remove entry */
+                pr_debug("Entry timed out\n");
+                lec_arp_remove(priv, entry);
+                lec_arp_put(entry);
+        } else {
+                /* Something else */
+                if ((entry->status == ESI_VC_PENDING ||
+                     entry->status == ESI_ARP_PENDING) &&
+                    time_after_eq(now, entry->timestamp +
+                                       priv->max_unknown_frame_time)) {
+                        entry->timestamp = jiffies;
+                        entry->packets_flooded = 0;
+                        if (entry->status == ESI_VC_PENDING)
+                                send_to_lecd(priv, l_svc_setup,
+                                             entry->mac_addr,
+                                             entry->atm_addr,
+                                             NULL);
+                }
+                if (entry->status == ESI_FLUSH_PENDING &&
+                    time_after_eq(now, entry->timestamp +
+                                       priv->path_switching_delay)) {
+                        lec_arp_hold(entry);
+                        return true;
+                }
+        }
+
+        return false;
+}
 /*
  * Expire entries.
  * 1. Re-set timer
@@ -1824,62 +1813,28 @@ static void lec_arp_check_expire(struct work_struct *work)
         struct hlist_node *node, *next;
         struct lec_arp_table *entry;
         unsigned long now;
-        unsigned long time_to_check;
         int i;
 
-        pr_debug("lec_arp_check_expire %p\n", priv);
+        pr_debug("%p\n", priv);
         now = jiffies;
 restart:
         spin_lock_irqsave(&priv->lec_arp_lock, flags);
         for (i = 0; i < LEC_ARP_TABLE_SIZE; i++) {
-                hlist_for_each_entry_safe(entry, node, next, &priv->lec_arp_tables[i], next) {
-                        if ((entry->flags) & LEC_REMOTE_FLAG &&
-                            priv->topology_change)
-                                time_to_check = priv->forward_delay_time;
-                        else
-                                time_to_check = priv->aging_time;
-
-                        pr_debug("About to expire: %lx - %lx > %lx\n",
-                                now, entry->last_used, time_to_check);
-                        if (time_after(now, entry->last_used + time_to_check)
-                            && !(entry->flags & LEC_PERMANENT_FLAG)
-                            && !(entry->mac_addr[0] & 0x01)) {  /* LANE2: 7.1.20 */
-                                /* Remove entry */
-                                pr_debug("LEC:Entry timed out\n");
-                                lec_arp_remove(priv, entry);
+                hlist_for_each_entry_safe(entry, node, next,
+                                          &priv->lec_arp_tables[i], next) {
+                        if (__lec_arp_check_expire(entry, now, priv)) {
+                                struct sk_buff *skb;
+                                struct atm_vcc *vcc = entry->vcc;
+
+                                spin_unlock_irqrestore(&priv->lec_arp_lock,
+                                                       flags);
+                                while ((skb = skb_dequeue(&entry->tx_wait)))
+                                        lec_send(vcc, skb);
+                                entry->last_used = jiffies;
+                                entry->status = ESI_FORWARD_DIRECT;
                                 lec_arp_put(entry);
-                        } else {
-                                /* Something else */
-                                if ((entry->status == ESI_VC_PENDING ||
-                                     entry->status == ESI_ARP_PENDING)
-                                    && time_after_eq(now,
-                                                     entry->timestamp +
-                                                     priv->
-                                                     max_unknown_frame_time)) {
-                                        entry->timestamp = jiffies;
-                                        entry->packets_flooded = 0;
-                                        if (entry->status == ESI_VC_PENDING)
-                                                send_to_lecd(priv, l_svc_setup,
-                                                             entry->mac_addr,
-                                                             entry->atm_addr,
-                                                             NULL);
-                                }
-                                if (entry->status == ESI_FLUSH_PENDING
-                                    &&
-                                    time_after_eq(now, entry->timestamp +
-                                                  priv->path_switching_delay)) {
-                                        struct sk_buff *skb;
-                                        struct atm_vcc *vcc = entry->vcc;
-
-                                        lec_arp_hold(entry);
-                                        spin_unlock_irqrestore(&priv->lec_arp_lock, flags);
-                                        while ((skb = skb_dequeue(&entry->tx_wait)) != NULL)
-                                                lec_send(vcc, skb);
-                                        entry->last_used = jiffies;
-                                        entry->status = ESI_FORWARD_DIRECT;
-                                        lec_arp_put(entry);
-                                        goto restart;
-                                }
+
+                                goto restart;
                         }
                 }
         }
@@ -1893,7 +1848,8 @@ restart:
  *
  */
 static struct atm_vcc *lec_arp_resolve(struct lec_priv *priv,
-                                       const unsigned char *mac_to_find, int is_rdesc,
+                                       const unsigned char *mac_to_find,
+                                       int is_rdesc,
                                        struct lec_arp_table **ret_entry)
 {
         unsigned long flags;
@@ -1929,9 +1885,8 @@ static struct atm_vcc *lec_arp_resolve(struct lec_priv *priv,
                  * If the LE_ARP cache entry is still pending, reset count to 0
                  * so another LE_ARP request can be made for this frame.
                  */
-                if (entry->status == ESI_ARP_PENDING) {
+                if (entry->status == ESI_ARP_PENDING)
                         entry->no_tries = 0;
-                }
                 /*
                  * Data direct VC not yet set up, check to see if the unknown
                  * frame count is greater than the limit. If the limit has
@@ -1942,7 +1897,7 @@ static struct atm_vcc *lec_arp_resolve(struct lec_priv *priv,
                     entry->packets_flooded <
                     priv->maximum_unknown_frame_count) {
                         entry->packets_flooded++;
-                        pr_debug("LEC_ARP: Flooding..\n");
+                        pr_debug("Flooding..\n");
                         found = priv->mcast_vcc;
                         goto out;
                 }
@@ -1953,13 +1908,13 @@ static struct atm_vcc *lec_arp_resolve(struct lec_priv *priv,
                  */
                 lec_arp_hold(entry);
                 *ret_entry = entry;
-                pr_debug("lec: entry->status %d entry->vcc %p\n", entry->status,
-                        entry->vcc);
+                pr_debug("entry->status %d entry->vcc %p\n", entry->status,
+                         entry->vcc);
                 found = NULL;
         } else {
                 /* No matching entry was found */
                 entry = make_entry(priv, mac_to_find);
-                pr_debug("LEC_ARP: Making entry\n");
+                pr_debug("Making entry\n");
                 if (!entry) {
                         found = priv->mcast_vcc;
                         goto out;
@@ -1996,13 +1951,14 @@ lec_addr_delete(struct lec_priv *priv, const unsigned char *atm_addr,
         struct lec_arp_table *entry;
         int i;
 
-        pr_debug("lec_addr_delete\n");
+        pr_debug("\n");
         spin_lock_irqsave(&priv->lec_arp_lock, flags);
         for (i = 0; i < LEC_ARP_TABLE_SIZE; i++) {
-                hlist_for_each_entry_safe(entry, node, next, &priv->lec_arp_tables[i], next) {
-                        if (!memcmp(atm_addr, entry->atm_addr, ATM_ESA_LEN)
-                            && (permanent ||
-                                !(entry->flags & LEC_PERMANENT_FLAG))) {
+                hlist_for_each_entry_safe(entry, node, next,
+                                          &priv->lec_arp_tables[i], next) {
+                        if (!memcmp(atm_addr, entry->atm_addr, ATM_ESA_LEN) &&
+                            (permanent ||
+                             !(entry->flags & LEC_PERMANENT_FLAG))) {
                                 lec_arp_remove(priv, entry);
                                 lec_arp_put(entry);
                         }
@@ -2027,10 +1983,8 @@ lec_arp_update(struct lec_priv *priv, const unsigned char *mac_addr,
         struct lec_arp_table *entry, *tmp;
         int i;
 
-        pr_debug("lec:%s", (targetless_le_arp) ? "targetless " : " ");
-        pr_debug("lec_arp_update mac:%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x\n",
-                mac_addr[0], mac_addr[1], mac_addr[2], mac_addr[3],
-                mac_addr[4], mac_addr[5]);
+        pr_debug("%smac:%pM\n",
+                 (targetless_le_arp) ? "targetless " : "", mac_addr);
 
         spin_lock_irqsave(&priv->lec_arp_lock, flags);
         entry = lec_arp_find(priv, mac_addr);
@@ -2040,7 +1994,8 @@ lec_arp_update(struct lec_priv *priv, const unsigned char *mac_addr,
                                  * we have no entry in the cache. 7.1.30
                                  */
         if (!hlist_empty(&priv->lec_arp_empty_ones)) {
-                hlist_for_each_entry_safe(entry, node, next, &priv->lec_arp_empty_ones, next) {
+                hlist_for_each_entry_safe(entry, node, next,
+                                          &priv->lec_arp_empty_ones, next) {
                         if (memcmp(entry->atm_addr, atm_addr, ATM_ESA_LEN) == 0) {
                                 hlist_del(&entry->next);
                                 del_timer(&entry->timer);
@@ -2084,7 +2039,8 @@ lec_arp_update(struct lec_priv *priv, const unsigned char *mac_addr,
         memcpy(entry->atm_addr, atm_addr, ATM_ESA_LEN);
         del_timer(&entry->timer);
         for (i = 0; i < LEC_ARP_TABLE_SIZE; i++) {
-                hlist_for_each_entry(tmp, node, &priv->lec_arp_tables[i], next) {
+                hlist_for_each_entry(tmp, node,
+                                     &priv->lec_arp_tables[i], next) {
                         if (entry != tmp &&
                             !memcmp(tmp->atm_addr, atm_addr, ATM_ESA_LEN)) {
                                 /* Vcc to this host exists */
@@ -2129,14 +2085,13 @@ lec_vcc_added(struct lec_priv *priv, const struct atmlec_ioc *ioc_data,
         int i, found_entry = 0;
 
         spin_lock_irqsave(&priv->lec_arp_lock, flags);
+        /* Vcc for Multicast Forward. No timer, LANEv2 7.1.20 and 2.3.5.3 */
         if (ioc_data->receive == 2) {
-                /* Vcc for Multicast Forward. No timer, LANEv2 7.1.20 and 2.3.5.3 */
-
                 pr_debug("LEC_ARP: Attaching mcast forward\n");
 #if 0
                 entry = lec_arp_find(priv, bus_mac);
                 if (!entry) {
-                        printk("LEC_ARP: Multicast entry not found!\n");
+                        pr_info("LEC_ARP: Multicast entry not found!\n");
                         goto out;
                 }
                 memcpy(entry->atm_addr, ioc_data->atm_addr, ATM_ESA_LEN);
@@ -2157,19 +2112,17 @@ lec_vcc_added(struct lec_priv *priv, const struct atmlec_ioc *ioc_data,
                  * Vcc which we don't want to make default vcc,
                  * attach it anyway.
                  */
-                pr_debug
-                    ("LEC_ARP:Attaching data direct, not default: "
-                     "%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x\n",
-                     ioc_data->atm_addr[0], ioc_data->atm_addr[1],
-                     ioc_data->atm_addr[2], ioc_data->atm_addr[3],
-                     ioc_data->atm_addr[4], ioc_data->atm_addr[5],
-                     ioc_data->atm_addr[6], ioc_data->atm_addr[7],
-                     ioc_data->atm_addr[8], ioc_data->atm_addr[9],
-                     ioc_data->atm_addr[10], ioc_data->atm_addr[11],
-                     ioc_data->atm_addr[12], ioc_data->atm_addr[13],
-                     ioc_data->atm_addr[14], ioc_data->atm_addr[15],
-                     ioc_data->atm_addr[16], ioc_data->atm_addr[17],
-                     ioc_data->atm_addr[18], ioc_data->atm_addr[19]);
+                pr_debug("LEC_ARP:Attaching data direct, not default: %2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x\n",
+                         ioc_data->atm_addr[0], ioc_data->atm_addr[1],
+                         ioc_data->atm_addr[2], ioc_data->atm_addr[3],
+                         ioc_data->atm_addr[4], ioc_data->atm_addr[5],
+                         ioc_data->atm_addr[6], ioc_data->atm_addr[7],
+                         ioc_data->atm_addr[8], ioc_data->atm_addr[9],
+                         ioc_data->atm_addr[10], ioc_data->atm_addr[11],
+                         ioc_data->atm_addr[12], ioc_data->atm_addr[13],
+                         ioc_data->atm_addr[14], ioc_data->atm_addr[15],
+                         ioc_data->atm_addr[16], ioc_data->atm_addr[17],
+                         ioc_data->atm_addr[18], ioc_data->atm_addr[19]);
                 entry = make_entry(priv, bus_mac);
                 if (entry == NULL)
                         goto out;
@@ -2185,29 +2138,28 @@ lec_vcc_added(struct lec_priv *priv, const struct atmlec_ioc *ioc_data,
                 dump_arp_table(priv);
                 goto out;
         }
-        pr_debug
-            ("LEC_ARP:Attaching data direct, default: "
-             "%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x\n",
-             ioc_data->atm_addr[0], ioc_data->atm_addr[1],
-             ioc_data->atm_addr[2], ioc_data->atm_addr[3],
-             ioc_data->atm_addr[4], ioc_data->atm_addr[5],
-             ioc_data->atm_addr[6], ioc_data->atm_addr[7],
-             ioc_data->atm_addr[8], ioc_data->atm_addr[9],
-             ioc_data->atm_addr[10], ioc_data->atm_addr[11],
-             ioc_data->atm_addr[12], ioc_data->atm_addr[13],
-             ioc_data->atm_addr[14], ioc_data->atm_addr[15],
-             ioc_data->atm_addr[16], ioc_data->atm_addr[17],
-             ioc_data->atm_addr[18], ioc_data->atm_addr[19]);
+        pr_debug("LEC_ARP:Attaching data direct, default: %2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x\n",
+                 ioc_data->atm_addr[0], ioc_data->atm_addr[1],
+                 ioc_data->atm_addr[2], ioc_data->atm_addr[3],
+                 ioc_data->atm_addr[4], ioc_data->atm_addr[5],
+                 ioc_data->atm_addr[6], ioc_data->atm_addr[7],
+                 ioc_data->atm_addr[8], ioc_data->atm_addr[9],
+                 ioc_data->atm_addr[10], ioc_data->atm_addr[11],
+                 ioc_data->atm_addr[12], ioc_data->atm_addr[13],
+                 ioc_data->atm_addr[14], ioc_data->atm_addr[15],
+                 ioc_data->atm_addr[16], ioc_data->atm_addr[17],
+                 ioc_data->atm_addr[18], ioc_data->atm_addr[19]);
         for (i = 0; i < LEC_ARP_TABLE_SIZE; i++) {
-                hlist_for_each_entry(entry, node, &priv->lec_arp_tables[i], next) {
+                hlist_for_each_entry(entry, node,
+                                     &priv->lec_arp_tables[i], next) {
                         if (memcmp
                             (ioc_data->atm_addr, entry->atm_addr,
                              ATM_ESA_LEN) == 0) {
                                 pr_debug("LEC_ARP: Attaching data direct\n");
                                 pr_debug("Currently -> Vcc: %d, Rvcc:%d\n",
-                                        entry->vcc ? entry->vcc->vci : 0,
-                                        entry->recv_vcc ? entry->recv_vcc->
-                                        vci : 0);
+                                         entry->vcc ? entry->vcc->vci : 0,
+                                         entry->recv_vcc ? entry->recv_vcc->
+                                         vci : 0);
                                 found_entry = 1;
                                 del_timer(&entry->timer);
                                 entry->vcc = vcc;
@@ -2279,19 +2231,21 @@ static void lec_flush_complete(struct lec_priv *priv, unsigned long tran_id)
         struct lec_arp_table *entry;
         int i;
 
-        pr_debug("LEC:lec_flush_complete %lx\n", tran_id);
+        pr_debug("%lx\n", tran_id);
 restart:
         spin_lock_irqsave(&priv->lec_arp_lock, flags);
         for (i = 0; i < LEC_ARP_TABLE_SIZE; i++) {
-                hlist_for_each_entry(entry, node, &priv->lec_arp_tables[i], next) {
-                        if (entry->flush_tran_id == tran_id
-                            && entry->status == ESI_FLUSH_PENDING) {
+                hlist_for_each_entry(entry, node,
+                                     &priv->lec_arp_tables[i], next) {
+                        if (entry->flush_tran_id == tran_id &&
+                            entry->status == ESI_FLUSH_PENDING) {
                                 struct sk_buff *skb;
                                 struct atm_vcc *vcc = entry->vcc;
 
                                 lec_arp_hold(entry);
-                                spin_unlock_irqrestore(&priv->lec_arp_lock, flags);
-                                while ((skb = skb_dequeue(&entry->tx_wait)) != NULL)
+                                spin_unlock_irqrestore(&priv->lec_arp_lock,
+                                                       flags);
+                                while ((skb = skb_dequeue(&entry->tx_wait)))
                                         lec_send(vcc, skb);
                                 entry->last_used = jiffies;
                                 entry->status = ESI_FORWARD_DIRECT;
@@ -2316,11 +2270,12 @@ lec_set_flush_tran_id(struct lec_priv *priv,
 
         spin_lock_irqsave(&priv->lec_arp_lock, flags);
         for (i = 0; i < LEC_ARP_TABLE_SIZE; i++)
-                hlist_for_each_entry(entry, node, &priv->lec_arp_tables[i], next) {
+                hlist_for_each_entry(entry, node,
+                                     &priv->lec_arp_tables[i], next) {
                         if (!memcmp(atm_addr, entry->atm_addr, ATM_ESA_LEN)) {
                                 entry->flush_tran_id = tran_id;
                                 pr_debug("Set flush transaction id to %lx for %p\n",
-                                        tran_id, entry);
+                                         tran_id, entry);
                         }
                 }
         spin_unlock_irqrestore(&priv->lec_arp_lock, flags);
@@ -2336,7 +2291,8 @@ static int lec_mcast_make(struct lec_priv *priv, struct atm_vcc *vcc)
         struct lec_vcc_priv *vpriv;
         int err = 0;
 
-        if (!(vpriv = kmalloc(sizeof(struct lec_vcc_priv), GFP_KERNEL)))
+        vpriv = kmalloc(sizeof(struct lec_vcc_priv), GFP_KERNEL);
+        if (!vpriv)
                 return -ENOMEM;
         vpriv->xoff = 0;
         vpriv->old_pop = vcc->pop;
@@ -2376,18 +2332,19 @@ static void lec_vcc_close(struct lec_priv *priv, struct atm_vcc *vcc)
         spin_lock_irqsave(&priv->lec_arp_lock, flags);
 
         for (i = 0; i < LEC_ARP_TABLE_SIZE; i++) {
-                hlist_for_each_entry_safe(entry, node, next, &priv->lec_arp_tables[i], next) {
+                hlist_for_each_entry_safe(entry, node, next,
+                                          &priv->lec_arp_tables[i], next) {
                         if (vcc == entry->vcc) {
                                 lec_arp_remove(priv, entry);
                                 lec_arp_put(entry);
-                                if (priv->mcast_vcc == vcc) {
+                                if (priv->mcast_vcc == vcc)
                                         priv->mcast_vcc = NULL;
-                                }
                         }
                 }
         }
 
-        hlist_for_each_entry_safe(entry, node, next, &priv->lec_arp_empty_ones, next) {
+        hlist_for_each_entry_safe(entry, node, next,
+                                  &priv->lec_arp_empty_ones, next) {
                 if (entry->vcc == vcc) {
                         lec_arp_clear_vccs(entry);
                         del_timer(&entry->timer);
@@ -2396,7 +2353,8 @@ static void lec_vcc_close(struct lec_priv *priv, struct atm_vcc *vcc)
                 }
         }
 
-        hlist_for_each_entry_safe(entry, node, next, &priv->lec_no_forward, next) {
+        hlist_for_each_entry_safe(entry, node, next,
+                                  &priv->lec_no_forward, next) {
                 if (entry->recv_vcc == vcc) {
                         lec_arp_clear_vccs(entry);
                         del_timer(&entry->timer);
@@ -2437,14 +2395,16 @@ lec_arp_check_empties(struct lec_priv *priv,
                 src = hdr->h_source;
 
         spin_lock_irqsave(&priv->lec_arp_lock, flags);
-        hlist_for_each_entry_safe(entry, node, next, &priv->lec_arp_empty_ones, next) {
+        hlist_for_each_entry_safe(entry, node, next,
+                                  &priv->lec_arp_empty_ones, next) {
                 if (vcc == entry->vcc) {
                         del_timer(&entry->timer);
                         memcpy(entry->mac_addr, src, ETH_ALEN);
                         entry->status = ESI_FORWARD_DIRECT;
                         entry->last_used = jiffies;
                         /* We might have got an entry */
-                        if ((tmp = lec_arp_find(priv, src))) {
+                        tmp = lec_arp_find(priv, src);
+                        if (tmp) {
                                 lec_arp_remove(priv, tmp);
                                 lec_arp_put(tmp);
                         }