Commit 99824461 authored by Joe Perches's avatar Joe Perches Committed by David S. Miller
Browse files

net/atm: Convert printk to pr_<level> 



Add #define pr_fmt(fmt) KBUILD_MODNAME ":%s: " fmt, __func__
Remove function names from output
Use single line pr_debug instead of broken multiple uses without newline

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b747caf3

net/atm/br2684.c

+9 −9
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@ 
 *          Eric Kinzie, 2006-2007, US Naval Research Laboratory

 */



#define pr_fmt(fmt) KBUILD_MODNAME ":%s: " fmt, __func__



#include <linux/module.h>

#include <linux/init.h>

#include <linux/kernel.h>
@@ -148,7 +150,7 @@ static void br2684_pop(struct atm_vcc *vcc, struct sk_buff *skb) 
	struct br2684_vcc *brvcc = BR2684_VCC(vcc);

	struct net_device *net_dev = skb->dev;



	pr_debug("br2684_pop(vcc %p ; net_dev %p )\n", vcc, net_dev);

	pr_debug("(vcc %p ; net_dev %p )\n", vcc, net_dev);

	brvcc->old_pop(vcc, skb);



	if (!net_dev)
@@ -244,7 +246,7 @@ static netdev_tx_t br2684_start_xmit(struct sk_buff *skb, 
	struct br2684_dev *brdev = BRPRIV(dev);

	struct br2684_vcc *brvcc;



	pr_debug("br2684_start_xmit, skb_dst(skb)=%p\n", skb_dst(skb));

	pr_debug("skb_dst(skb)=%p\n", skb_dst(skb));

	read_lock(&devs_lock);

	brvcc = pick_outgoing_vcc(skb, brdev);

	if (brvcc == NULL) {
@@ -352,7 +354,7 @@ static void br2684_push(struct atm_vcc *atmvcc, struct sk_buff *skb) 
	struct net_device *net_dev = brvcc->device;

	struct br2684_dev *brdev = BRPRIV(net_dev);



	pr_debug("br2684_push\n");

	pr_debug("\n");



	if (unlikely(skb == NULL)) {

		/* skb==NULL means VCC is being destroyed */
@@ -479,8 +481,7 @@ static int br2684_regvcc(struct atm_vcc *atmvcc, void __user * arg) 
	write_lock_irq(&devs_lock);

	net_dev = br2684_find_dev(&be.ifspec);

	if (net_dev == NULL) {

		printk(KERN_ERR

		       "br2684: tried to attach to non-existant device\n");

		pr_err("tried to attach to non-existant device\n");

		err = -ENXIO;

		goto error;

	}
@@ -503,8 +504,7 @@ static int br2684_regvcc(struct atm_vcc *atmvcc, void __user * arg) 
		err = -EINVAL;

		goto error;

	}

	pr_debug("br2684_regvcc vcc=%p, encaps=%d, brvcc=%p\n", atmvcc,

		 be.encaps, brvcc);

	pr_debug("vcc=%p, encaps=%d, brvcc=%p\n", atmvcc, be.encaps, brvcc);

	if (list_empty(&brdev->brvccs) && !brdev->mac_was_set) {

		unsigned char *esi = atmvcc->dev->esi;

		if (esi[0] | esi[1] | esi[2] | esi[3] | esi[4] | esi[5])
@@ -595,7 +595,7 @@ static int br2684_create(void __user * arg) 
	struct atm_newif_br2684 ni;

	enum br2684_payload payload;



	pr_debug("br2684_create\n");

	pr_debug("\n");



	if (copy_from_user(&ni, arg, sizeof ni)) {

		return -EFAULT;
@@ -624,7 +624,7 @@ static int br2684_create(void __user * arg) 
	/* open, stop, do_ioctl ? */

	err = register_netdev(netdev);

	if (err < 0) {

		printk(KERN_ERR "br2684_create: register_netdev failed\n");

		pr_err("register_netdev failed\n");

		free_netdev(netdev);

		return err;

	}

net/atm/clip.c

+29 −31
Original line number Diff line number Diff line
@@ -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 */
@@ -51,7 +53,7 @@ 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);
@@ -71,8 +73,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 +87,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,12 +107,10 @@ 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);

	pr_crit("ATMARP: failed (entry %p, vcc 0x%p)\n", entry, clip_vcc);

      out:

	netif_tx_unlock_bh(entry->neigh->dev);

}
@@ -163,7 +162,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 +187,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)
@@ -239,7 +238,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 +254,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 +283,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 +368,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 +384,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 +420,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 +455,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 +505,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 +528,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 +613,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;

	}
@@ -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;
@@ -950,8 +949,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;

		}

net/atm/common.c

+29 −23
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 


/* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */



#define pr_fmt(fmt) KBUILD_MODNAME ":%s: " fmt, __func__



#include <linux/module.h>

#include <linux/kmod.h>
@@ -64,8 +65,7 @@ static struct sk_buff *alloc_tx(struct atm_vcc *vcc,unsigned int size) 


	if (sk_wmem_alloc_get(sk) && !atm_may_send(vcc, size)) {

		pr_debug("Sorry: wmem_alloc = %d, size = %d, sndbuf = %d\n",

			sk_wmem_alloc_get(sk), size,

			sk->sk_sndbuf);

			 sk_wmem_alloc_get(sk), size, sk->sk_sndbuf);

		return NULL;

	}

	while (!(skb = alloc_skb(size, GFP_KERNEL)))
@@ -249,8 +249,7 @@ static int adjust_tp(struct atm_trafprm *tp,unsigned char aal) 
			max_sdu = ATM_MAX_AAL34_PDU;

			break;

		default:

			printk(KERN_WARNING "ATM: AAL problems ... "

			    "(%d)\n",aal);

			pr_warning("AAL problems ... (%d)\n", aal);

			/* fall through */

		case ATM_AAL5:

			max_sdu = ATM_MAX_AAL5_PDU;
@@ -386,10 +385,16 @@ static int __vcc_connect(struct atm_vcc *vcc, struct atm_dev *dev, short vpi, 
	if (error)

		goto fail;

	pr_debug("VCC %d.%d, AAL %d\n", vpi, vci, vcc->qos.aal);

	pr_debug("  TX: %d, PCR %d..%d, SDU %d\n",vcc->qos.txtp.traffic_class,

	    vcc->qos.txtp.min_pcr,vcc->qos.txtp.max_pcr,vcc->qos.txtp.max_sdu);

	pr_debug("  RX: %d, PCR %d..%d, SDU %d\n",vcc->qos.rxtp.traffic_class,

	    vcc->qos.rxtp.min_pcr,vcc->qos.rxtp.max_pcr,vcc->qos.rxtp.max_sdu);

	pr_debug("  TX: %d, PCR %d..%d, SDU %d\n",

		 vcc->qos.txtp.traffic_class,

		 vcc->qos.txtp.min_pcr,

		 vcc->qos.txtp.max_pcr,

		 vcc->qos.txtp.max_sdu);

	pr_debug("  RX: %d, PCR %d..%d, SDU %d\n",

		 vcc->qos.rxtp.traffic_class,

		 vcc->qos.rxtp.min_pcr,

		 vcc->qos.rxtp.max_pcr,

		 vcc->qos.rxtp.max_sdu);



	if (dev->ops->open) {

		if ((error = dev->ops->open(vcc)))
@@ -413,7 +418,7 @@ int vcc_connect(struct socket *sock, int itf, short vpi, int vci) 
	struct atm_vcc *vcc = ATM_SD(sock);

	int error;



	pr_debug("vcc_connect (vpi %d, vci %d)\n",vpi,vci);

	pr_debug("(vpi %d, vci %d)\n", vpi, vci);

	if (sock->state == SS_CONNECTED)

		return -EISCONN;

	if (sock->state != SS_UNCONNECTED)
@@ -426,14 +431,15 @@ int vcc_connect(struct socket *sock, int itf, short vpi, int vci) 
	else

		if (test_bit(ATM_VF_PARTIAL,&vcc->flags))

			return -EINVAL;

	pr_debug("vcc_connect (TX: cl %d,bw %d-%d,sdu %d; "

	pr_debug("(TX: cl %d,bw %d-%d,sdu %d; "

		 "RX: cl %d,bw %d-%d,sdu %d,AAL %s%d)\n",

		 vcc->qos.txtp.traffic_class, vcc->qos.txtp.min_pcr,

		 vcc->qos.txtp.max_pcr, vcc->qos.txtp.max_sdu,

		 vcc->qos.rxtp.traffic_class, vcc->qos.rxtp.min_pcr,

		 vcc->qos.rxtp.max_pcr,vcc->qos.rxtp.max_sdu,

	    vcc->qos.aal == ATM_AAL5 ? "" : vcc->qos.aal == ATM_AAL0 ? "" :

	    " ??? code ",vcc->qos.aal == ATM_AAL0 ? 0 : vcc->qos.aal);

		 vcc->qos.aal == ATM_AAL5 ? "" :

		 vcc->qos.aal == ATM_AAL0 ? "" : " ??? code ",

		 vcc->qos.aal == ATM_AAL0 ? 0 : vcc->qos.aal);

	if (!test_bit(ATM_VF_HASQOS, &vcc->flags))

		return -EBADFD;

	if (vcc->qos.txtp.traffic_class == ATM_ANYCLASS ||
@@ -497,7 +503,7 @@ int vcc_recvmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg, 
	if (error)

		return error;

	sock_recv_ts_and_drops(msg, sk, skb);

	pr_debug("RcvM %d -= %d\n", atomic_read(&sk->sk_rmem_alloc), skb->truesize);

	pr_debug("%d -= %d\n", atomic_read(&sk->sk_rmem_alloc), skb->truesize);

	atm_return(vcc, skb->truesize);

	skb_free_datagram(sk, skb);

	return copied;
@@ -772,19 +778,19 @@ static int __init atm_init(void) 
		goto out;



	if ((error = atmpvc_init()) < 0) {

		printk(KERN_ERR "atmpvc_init() failed with %d\n", error);

		pr_err("atmpvc_init() failed with %d\n", error);

		goto out_unregister_vcc_proto;

	}

	if ((error = atmsvc_init()) < 0) {

		printk(KERN_ERR "atmsvc_init() failed with %d\n", error);

		pr_err("atmsvc_init() failed with %d\n", error);

		goto out_atmpvc_exit;

	}

	if ((error = atm_proc_init()) < 0) {

		printk(KERN_ERR "atm_proc_init() failed with %d\n",error);

		pr_err("atm_proc_init() failed with %d\n", error);

		goto out_atmsvc_exit;

	}

	if ((error = atm_sysfs_init()) < 0) {

		printk(KERN_ERR "atm_sysfs_init() failed with %d\n",error);

		pr_err("atm_sysfs_init() failed with %d\n", error);

		goto out_atmproc_exit;

	}

out:

net/atm/ioctl.c

+4 −3
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
/* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */

/* 2003 John Levon  <levon@movementarian.org> */



#define pr_fmt(fmt) KBUILD_MODNAME ":%s: " fmt, __func__



#include <linux/module.h>

#include <linux/kmod.h>
@@ -97,7 +98,7 @@ static int do_vcc_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg 
			goto done;

		case ATM_SETSC:

			if (net_ratelimit())

				printk(KERN_WARNING "ATM_SETSC is obsolete; used by %s:%d\n",

				pr_warning("ATM_SETSC is obsolete; used by %s:%d\n",

					   current->comm, task_pid_nr(current));

			error = 0;

			goto done;
@@ -123,7 +124,7 @@ static int do_vcc_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg 
			   to think about it at all. dwmw2. */

			if (compat) {

				if (net_ratelimit())

					printk(KERN_WARNING "32-bit task cannot be atmsigd\n");

					pr_warning("32-bit task cannot be atmsigd\n");

				error = -EINVAL;

				goto done;

			}

net/atm/lec.c

+82 −110
Original line number Diff line number Diff line
@@ -4,6 +4,8 @@ 
 * Marko Kiiskila <mkiiskila@yahoo.com>

 */



#define pr_fmt(fmt) KBUILD_MODNAME ":%s: " fmt, __func__



#include <linux/kernel.h>

#include <linux/bitops.h>

#include <linux/capability.h>
@@ -242,7 +244,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);

}
@@ -266,7 +268,7 @@ static netdev_tx_t lec_start_xmit(struct sk_buff *skb, 
	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);

		dev->stats.tx_errors++;
@@ -286,7 +288,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)
@@ -367,19 +369,16 @@ 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);

		}
@@ -390,8 +389,7 @@ static netdev_tx_t lec_start_xmit(struct sk_buff *skb, 
#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);

	}
@@ -477,9 +475,9 @@ 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",

			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);
@@ -531,8 +529,7 @@ static int lec_atm_send(struct atm_vcc *vcc, struct sk_buff *skb) 
				struct sk_buff *skb2;

				struct sock *sk;



				pr_debug

				    ("%s: entry found, responding to zeppelin\n",

				pr_debug("%s: entry found, responding to zeppelin\n",

					 dev->name);

				skb2 =

				    alloc_skb(sizeof(struct atmlec_msg),
@@ -633,7 +630,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);
@@ -692,35 +689,27 @@ static void lec_push(struct atm_vcc *vcc, struct sk_buff *skb) 
	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);

	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);
@@ -801,7 +790,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;

	}
@@ -822,11 +811,8 @@ 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;
@@ -1199,7 +1185,7 @@ 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
@@ -1450,10 +1436,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);

}



/*
@@ -1492,10 +1475,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;

}
@@ -1714,9 +1694,7 @@ 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) {
@@ -1755,7 +1733,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)
@@ -1779,7 +1757,7 @@ 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",

	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);
@@ -1819,7 +1797,7 @@ static void lec_arp_check_expire(struct work_struct *work) 
	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);
@@ -1837,7 +1815,7 @@ static void lec_arp_check_expire(struct work_struct *work) 
			    && !(entry->flags & LEC_PERMANENT_FLAG)

			    && !(entry->mac_addr[0] & 0x01)) {	/* LANE2: 7.1.20 */

				/* Remove entry */

				pr_debug("LEC:Entry timed out\n");

				pr_debug("Entry timed out\n");

				lec_arp_remove(priv, entry);

				lec_arp_put(entry);

			} else {
@@ -1934,7 +1912,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;

		}
@@ -1945,13 +1923,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,

		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;
@@ -1988,7 +1966,7 @@ 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) {
@@ -2019,10 +1997,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);
@@ -2149,9 +2125,7 @@ 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",

		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],
@@ -2177,9 +2151,7 @@ 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",

	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],
@@ -2271,7 +2243,7 @@ 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++) {