Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

net/atm/mpc.c: checkpatch cleanups 



Convert #include <asm... to #include <linux...
Add printk argument verification to dprintk and ddprintk
Spacing cleanups
Mostly 80 column wrapped.
printk->pr_info and pr_cont
Moved labels to column 1
Move trailing statements to new lines
switch/case cleanups
	remove unnecessary breaks after returns
Remove unnecessary braces around single line statements

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

net/atm/mpc.c

+252 −193
Original line number Diff line number Diff line
@@ -15,8 +15,8 @@ 
#include <net/sock.h>

#include <linux/skbuff.h>

#include <linux/ip.h>

#include <linux/uaccess.h>

#include <asm/byteorder.h>

#include <asm/uaccess.h>

#include <net/checksum.h>   /* for ip_fast_csum() */

#include <net/arp.h>

#include <net/dst.h>
@@ -38,15 +38,17 @@ 
 */



#if 0

#define dprintk printk   /* debug */

#define dprintk(format, args...) printk(KERN_DEBUG format, ##args)   /* debug */

#else

#define dprintk(format,args...)

#define dprintk(format, args...)			\

	do { if (0) printk(KERN_DEBUG format, ##args); } while (0)

#endif



#if 0

#define ddprintk printk  /* more debug */

#define ddprintk printk(KERN_DEBUG format, ##args)  /* more debug */

#else

#define ddprintk(format,args...)

#define ddprintk(format, args...)			\

	do { if (0) printk(KERN_DEBUG format, ##args); } while (0)

#endif
@@ -59,10 +61,14 @@ static void MPOA_res_reply_rcvd(struct k_message *msg, struct mpoa_client *mpc); 
static void ingress_purge_rcvd(struct k_message *msg, struct mpoa_client *mpc);

static void egress_purge_rcvd(struct k_message *msg, struct mpoa_client *mpc);

static void mps_death(struct k_message *msg, struct mpoa_client *mpc);

static void clean_up(struct k_message *msg, struct mpoa_client *mpc, int action);

static void MPOA_cache_impos_rcvd(struct k_message *msg, struct mpoa_client *mpc);

static void set_mpc_ctrl_addr_rcvd(struct k_message *mesg, struct mpoa_client *mpc);

static void set_mps_mac_addr_rcvd(struct k_message *mesg, struct mpoa_client *mpc);

static void clean_up(struct k_message *msg, struct mpoa_client *mpc,

		     int action);

static void MPOA_cache_impos_rcvd(struct k_message *msg,

				  struct mpoa_client *mpc);

static void set_mpc_ctrl_addr_rcvd(struct k_message *mesg,

				   struct mpoa_client *mpc);

static void set_mps_mac_addr_rcvd(struct k_message *mesg,

				  struct mpoa_client *mpc);



static const uint8_t *copy_macs(struct mpoa_client *mpc,

				const uint8_t *router_mac,
@@ -77,7 +83,8 @@ static int msg_from_mpoad(struct atm_vcc *vcc, struct sk_buff *skb); 
static void mpc_push(struct atm_vcc *vcc, struct sk_buff *skb);

static netdev_tx_t mpc_send_packet(struct sk_buff *skb,

				   struct net_device *dev);

static int mpoa_event_listener(struct notifier_block *mpoa_notifier, unsigned long event, void *dev);

static int mpoa_event_listener(struct notifier_block *mpoa_notifier,

			       unsigned long event, void *dev);

static void mpc_timer_refresh(void);

static void mpc_cache_check(unsigned long checking_time);
@@ -169,7 +176,7 @@ struct atm_mpoa_qos *atm_mpoa_add_qos(__be32 dst_ip, struct atm_qos *qos) 


	entry = kmalloc(sizeof(struct atm_mpoa_qos), GFP_KERNEL);

	if (entry == NULL) {

		printk("mpoa: atm_mpoa_add_qos: out of memory\n");

		pr_info("mpoa: out of memory\n");

		return entry;

	}
@@ -187,10 +194,9 @@ struct atm_mpoa_qos *atm_mpoa_search_qos(__be32 dst_ip) 
	struct atm_mpoa_qos *qos;



	qos = qos_head;

	while( qos != NULL ){

		if(qos->ipaddr == dst_ip) {

	while (qos) {

		if (qos->ipaddr == dst_ip)

			break;

		}

		qos = qos->next;

	}
@@ -202,10 +208,10 @@ struct atm_mpoa_qos *atm_mpoa_search_qos(__be32 dst_ip) 
 */

int atm_mpoa_delete_qos(struct atm_mpoa_qos *entry)

{



	struct atm_mpoa_qos *curr;



	if (entry == NULL) return 0;

	if (entry == NULL)

		return 0;

	if (entry == qos_head) {

		qos_head = qos_head->next;

		kfree(entry);
@@ -237,8 +243,16 @@ void atm_mpoa_disp_qos(struct seq_file *m) 
	while (qos != NULL) {

		seq_printf(m, "%pI4\n     %-7d %-7d %-7d %-7d %-7d\n     %-7d %-7d %-7d %-7d %-7d\n",

			   &qos->ipaddr,

				qos->qos.txtp.max_pcr, qos->qos.txtp.pcr, qos->qos.txtp.min_pcr, qos->qos.txtp.max_cdv, qos->qos.txtp.max_sdu,

				qos->qos.rxtp.max_pcr, qos->qos.rxtp.pcr, qos->qos.rxtp.min_pcr, qos->qos.rxtp.max_cdv, qos->qos.rxtp.max_sdu);

			   qos->qos.txtp.max_pcr,

			   qos->qos.txtp.pcr,

			   qos->qos.txtp.min_pcr,

			   qos->qos.txtp.max_cdv,

			   qos->qos.txtp.max_sdu,

			   qos->qos.rxtp.max_pcr,

			   qos->qos.rxtp.pcr,

			   qos->qos.rxtp.min_pcr,

			   qos->qos.rxtp.max_cdv,

			   qos->qos.rxtp.max_sdu);

		qos = qos->next;

	}

}
@@ -290,7 +304,7 @@ static void start_mpc(struct mpoa_client *mpc, struct net_device *dev) 


	dprintk("mpoa: (%s) start_mpc:\n", mpc->dev->name);

	if (!dev->netdev_ops)

		printk("mpoa: (%s) start_mpc  not starting\n", dev->name);

		pr_info("(%s) not starting\n", dev->name);

	else {

		mpc->old_ops = dev->netdev_ops;

		mpc->new_ops = *mpc->old_ops;
@@ -324,22 +338,15 @@ static const char *mpoa_device_type_string(char type) 
	switch (type) {

	case NON_MPOA:

		return "non-MPOA device";

		break;

	case MPS:

		return "MPS";

		break;

	case MPC:

		return "MPC";

		break;

	case MPS_AND_MPC:

		return "both MPS and MPC";

		break;

	default:

		return "unspecified (non-MPOA) device";

		break;

	}



	return ""; /* not reached */

	return "unspecified (non-MPOA) device";

}



/*
@@ -368,22 +375,24 @@ static void lane2_assoc_ind(struct net_device *dev, const u8 *mac_addr, 
	dprintk("total length of all TLVs %d\n", sizeoftlvs);

	mpc = find_mpc_by_lec(dev); /* Sampo-Fix: moved here from below */

	if (mpc == NULL) {

		printk("mpoa: (%s) lane2_assoc_ind: no mpc\n", dev->name);

		pr_info("(%s) no mpc\n", dev->name);

		return;

	}

	end_of_tlvs = tlvs + sizeoftlvs;

	while (end_of_tlvs - tlvs >= 5) {

		type = (tlvs[0] << 24) | (tlvs[1] << 16) | (tlvs[2] << 8) | tlvs[3];

		type = ((tlvs[0] << 24) | (tlvs[1] << 16) |

			(tlvs[2] << 8) | tlvs[3]);

		length = tlvs[4];

		tlvs += 5;

		dprintk("    type 0x%x length %02x\n", type, length);

		if (tlvs + length > end_of_tlvs) {

			printk("TLV value extends past its buffer, aborting parse\n");

			pr_info("TLV value extends past its buffer, aborting parse\n");

			return;

		}



		if (type == 0) {

			printk("mpoa: (%s) lane2_assoc_ind: TLV type was 0, returning\n", dev->name);

			pr_info("mpoa: (%s) TLV type was 0, returning\n",

				dev->name);

			return;

		}
@@ -393,38 +402,46 @@ static void lane2_assoc_ind(struct net_device *dev, const u8 *mac_addr, 
		}

		mpoa_device_type = *tlvs++;

		number_of_mps_macs = *tlvs++;

		dprintk("mpoa: (%s) MPOA device type '%s', ", dev->name, mpoa_device_type_string(mpoa_device_type));

		dprintk("mpoa: (%s) MPOA device type '%s', ",

			dev->name, mpoa_device_type_string(mpoa_device_type));

		if (mpoa_device_type == MPS_AND_MPC &&

		    length < (42 + number_of_mps_macs*ETH_ALEN)) { /* :) */

			printk("\nmpoa: (%s) lane2_assoc_ind: short MPOA Device Type TLV\n",

			pr_info("(%s) short MPOA Device Type TLV\n",

				dev->name);

			continue;

		}

		if ((mpoa_device_type == MPS || mpoa_device_type == MPC)

		    && length < 22 + number_of_mps_macs*ETH_ALEN) {

			printk("\nmpoa: (%s) lane2_assoc_ind: short MPOA Device Type TLV\n",

				dev->name);

		if ((mpoa_device_type == MPS || mpoa_device_type == MPC) &&

		    length < 22 + number_of_mps_macs*ETH_ALEN) {

			pr_info("(%s) short MPOA Device Type TLV\n", dev->name);

			continue;

		}

		if (mpoa_device_type != MPS && mpoa_device_type != MPS_AND_MPC) {

		if (mpoa_device_type != MPS &&

		    mpoa_device_type != MPS_AND_MPC) {

			dprintk("ignoring non-MPS device\n");

			if (mpoa_device_type == MPC) tlvs += 20;

			if (mpoa_device_type == MPC)

				tlvs += 20;

			continue;  /* we are only interested in MPSs */

		}

		if (number_of_mps_macs == 0 && mpoa_device_type == MPS_AND_MPC) {

			printk("\nmpoa: (%s) lane2_assoc_ind: MPS_AND_MPC has zero MACs\n", dev->name);

		if (number_of_mps_macs == 0 &&

		    mpoa_device_type == MPS_AND_MPC) {

			pr_info("(%s) MPS_AND_MPC has zero MACs\n", dev->name);

			continue;  /* someone should read the spec */

		}

		dprintk("this MPS has %d MAC addresses\n", number_of_mps_macs);



		/* ok, now we can go and tell our daemon the control address of MPS */

		/*

		 * ok, now we can go and tell our daemon

		 * the control address of MPS

		 */

		send_set_mps_ctrl_addr(tlvs, mpc);



		tlvs = copy_macs(mpc, mac_addr, tlvs, number_of_mps_macs, mpoa_device_type);

		if (tlvs == NULL) return;

		tlvs = copy_macs(mpc, mac_addr, tlvs,

				 number_of_mps_macs, mpoa_device_type);

		if (tlvs == NULL)

			return;

	}

	if (end_of_tlvs - tlvs != 0)

		printk("mpoa: (%s) lane2_assoc_ind: ignoring %Zd bytes of trailing TLV carbage\n",

		pr_info("(%s) ignoring %Zd bytes of trailing TLV garbage\n",

			dev->name, end_of_tlvs - tlvs);

	return;

}
@@ -443,11 +460,12 @@ static const uint8_t *copy_macs(struct mpoa_client *mpc, 
	num_macs = (mps_macs > 1) ? mps_macs : 1;



	if (mpc->number_of_mps_macs != num_macs) { /* need to reallocate? */

		if (mpc->number_of_mps_macs != 0) kfree(mpc->mps_macs);

		if (mpc->number_of_mps_macs != 0)

			kfree(mpc->mps_macs);

		mpc->number_of_mps_macs = 0;

		mpc->mps_macs = kmalloc(num_macs * ETH_ALEN, GFP_KERNEL);

		if (mpc->mps_macs == NULL) {

			printk("mpoa: (%s) copy_macs: out of mem\n", mpc->dev->name);

			pr_info("(%s) out of mem\n", mpc->dev->name);

			return NULL;

		}

	}
@@ -480,24 +498,30 @@ static int send_via_shortcut(struct sk_buff *skb, struct mpoa_client *mpc) 
	iph = (struct iphdr *)buff;

	ipaddr = iph->daddr;



	ddprintk("mpoa: (%s) send_via_shortcut: ipaddr 0x%x\n", mpc->dev->name, ipaddr);

	ddprintk("mpoa: (%s) send_via_shortcut: ipaddr 0x%x\n",

		 mpc->dev->name, ipaddr);



	entry = mpc->in_ops->get(ipaddr, mpc);

	if (entry == NULL) {

		entry = mpc->in_ops->add_entry(ipaddr, mpc);

		if (entry != NULL) mpc->in_ops->put(entry);

		if (entry != NULL)

			mpc->in_ops->put(entry);

		return 1;

	}

	if (mpc->in_ops->cache_hit(entry, mpc) != OPEN){   /* threshold not exceeded or VCC not ready */

		ddprintk("mpoa: (%s) send_via_shortcut: cache_hit: returns != OPEN\n", mpc->dev->name);

	/* threshold not exceeded or VCC not ready */

	if (mpc->in_ops->cache_hit(entry, mpc) != OPEN) {

		ddprintk("mpoa: (%s) send_via_shortcut: cache_hit: returns != OPEN\n",

			 mpc->dev->name);

		mpc->in_ops->put(entry);

		return 1;

	}



	ddprintk("mpoa: (%s) send_via_shortcut: using shortcut\n", mpc->dev->name);

	ddprintk("mpoa: (%s) send_via_shortcut: using shortcut\n",

		 mpc->dev->name);

	/* MPOA spec A.1.4, MPOA client must decrement IP ttl at least by one */

	if (iph->ttl <= 1) {

		ddprintk("mpoa: (%s) send_via_shortcut: IP ttl = %u, using LANE\n", mpc->dev->name, iph->ttl);

		ddprintk("mpoa: (%s) send_via_shortcut: IP ttl = %u, using LANE\n",

			 mpc->dev->name, iph->ttl);

		mpc->in_ops->put(entry);

		return 1;

	}
@@ -506,15 +530,18 @@ static int send_via_shortcut(struct sk_buff *skb, struct mpoa_client *mpc) 
	iph->check = ip_fast_csum((unsigned char *)iph, iph->ihl);



	if (entry->ctrl_info.tag != 0) {

		ddprintk("mpoa: (%s) send_via_shortcut: adding tag 0x%x\n", mpc->dev->name, entry->ctrl_info.tag);

		ddprintk("mpoa: (%s) send_via_shortcut: adding tag 0x%x\n",

			 mpc->dev->name, entry->ctrl_info.tag);

		tagged_llc_snap_hdr.tag = entry->ctrl_info.tag;

		skb_pull(skb, ETH_HLEN);	/* get rid of Eth header */

		skb_push(skb, sizeof(tagged_llc_snap_hdr));    /* add LLC/SNAP header   */

		skb_push(skb, sizeof(tagged_llc_snap_hdr));

						/* add LLC/SNAP header   */

		skb_copy_to_linear_data(skb, &tagged_llc_snap_hdr,

					sizeof(tagged_llc_snap_hdr));

	} else {

		skb_pull(skb, ETH_HLEN);	/* get rid of Eth header */

		skb_push(skb, sizeof(struct llc_snap_hdr));     /* add LLC/SNAP header + tag  */

		skb_push(skb, sizeof(struct llc_snap_hdr));

						/* add LLC/SNAP header + tag  */

		skb_copy_to_linear_data(skb, &llc_snap_mpoa_data,

					sizeof(struct llc_snap_hdr));

	}
@@ -540,7 +567,7 @@ static netdev_tx_t mpc_send_packet(struct sk_buff *skb, 


	mpc = find_mpc_by_lec(dev); /* this should NEVER fail */

	if (mpc == NULL) {

		printk("mpoa: (%s) mpc_send_packet: no MPC found\n", dev->name);

		pr_info("(%s) no MPC found\n", dev->name);

		goto non_ip;

	}
@@ -556,9 +583,10 @@ static netdev_tx_t mpc_send_packet(struct sk_buff *skb, 
		goto non_ip;



	while (i < mpc->number_of_mps_macs) {

		if (!compare_ether_addr(eth->h_dest, (mpc->mps_macs + i*ETH_ALEN)))

		if (!compare_ether_addr(eth->h_dest,

					(mpc->mps_macs + i*ETH_ALEN)))

			if (send_via_shortcut(skb, mpc) == 0) /* try shortcut */

				return NETDEV_TX_OK;                      /* success!     */

				return NETDEV_TX_OK;

		i++;

	}
@@ -576,7 +604,8 @@ static int atm_mpoa_vcc_attach(struct atm_vcc *vcc, void __user *arg) 


	bytes_left = copy_from_user(&ioc_data, arg, sizeof(struct atmmpc_ioc));

	if (bytes_left != 0) {

		printk("mpoa: mpc_vcc_attach: Short read (missed %d bytes) from userland\n", bytes_left);

		pr_info("mpoa:Short read (missed %d bytes) from userland\n",

			bytes_left);

		return -EFAULT;

	}

	ipaddr = ioc_data.ipaddr;
@@ -589,18 +618,20 @@ static int atm_mpoa_vcc_attach(struct atm_vcc *vcc, void __user *arg) 


	if (ioc_data.type == MPC_SOCKET_INGRESS) {

		in_entry = mpc->in_ops->get(ipaddr, mpc);

		if (in_entry == NULL || in_entry->entry_state < INGRESS_RESOLVED) {

			printk("mpoa: (%s) mpc_vcc_attach: did not find RESOLVED entry from ingress cache\n",

		if (in_entry == NULL ||

		    in_entry->entry_state < INGRESS_RESOLVED) {

			pr_info("(%s) did not find RESOLVED entry from ingress cache\n",

				mpc->dev->name);

			if (in_entry != NULL) mpc->in_ops->put(in_entry);

			if (in_entry != NULL)

				mpc->in_ops->put(in_entry);

			return -EINVAL;

		}

		printk("mpoa: (%s) mpc_vcc_attach: attaching ingress SVC, entry = %pI4\n",

		pr_info("(%s) attaching ingress SVC, entry = %pI4\n",

			mpc->dev->name, &in_entry->ctrl_info.in_dst_ip);

		in_entry->shortcut = vcc;

		mpc->in_ops->put(in_entry);

	} else {

		printk("mpoa: (%s) mpc_vcc_attach: attaching egress SVC\n", mpc->dev->name);

		pr_info("(%s) attaching egress SVC\n", mpc->dev->name);

	}



	vcc->proto_data = mpc->dev;
@@ -620,7 +651,7 @@ static void mpc_vcc_close(struct atm_vcc *vcc, struct net_device *dev) 


	mpc = find_mpc_by_lec(dev);

	if (mpc == NULL) {

		printk("mpoa: (%s) mpc_vcc_close: close for unknown MPC\n", dev->name);

		pr_info("(%s) close for unknown MPC\n", dev->name);

		return;

	}
@@ -634,13 +665,15 @@ static void mpc_vcc_close(struct atm_vcc *vcc, struct net_device *dev) 
	}

	eg_entry = mpc->eg_ops->get_by_vcc(vcc, mpc);

	if (eg_entry) {

		dprintk("mpoa: (%s) mpc_vcc_close: egress SVC closed\n", mpc->dev->name);

		dprintk("mpoa: (%s) mpc_vcc_close: egress SVC closed\n",

			mpc->dev->name);

		eg_entry->shortcut = NULL;

		mpc->eg_ops->put(eg_entry);

	}



	if (in_entry == NULL && eg_entry == NULL)

		dprintk("mpoa: (%s) mpc_vcc_close:  unused vcc closed\n", dev->name);

		dprintk("mpoa: (%s) mpc_vcc_close:  unused vcc closed\n",

			dev->name);



	return;

}
@@ -656,16 +689,19 @@ static void mpc_push(struct atm_vcc *vcc, struct sk_buff *skb) 


	ddprintk("mpoa: (%s) mpc_push:\n", dev->name);

	if (skb == NULL) {

		dprintk("mpoa: (%s) mpc_push: null skb, closing VCC\n", dev->name);

		dprintk("mpoa: (%s) mpc_push: null skb, closing VCC\n",

			dev->name);

		mpc_vcc_close(vcc, dev);

		return;

	}



	skb->dev = dev;

	if (memcmp(skb->data, &llc_snap_mpoa_ctrl, sizeof(struct llc_snap_hdr)) == 0) {

	if (memcmp(skb->data, &llc_snap_mpoa_ctrl,

		   sizeof(struct llc_snap_hdr)) == 0) {

		struct sock *sk = sk_atm(vcc);



		dprintk("mpoa: (%s) mpc_push: control packet arrived\n", dev->name);

		dprintk("mpoa: (%s) mpc_push: control packet arrived\n",

			dev->name);

		/* Pass control packets to daemon */

		skb_queue_tail(&sk->sk_receive_queue, skb);

		sk->sk_data_ready(sk, skb->len);
@@ -677,20 +713,23 @@ static void mpc_push(struct atm_vcc *vcc, struct sk_buff *skb) 


	mpc = find_mpc_by_lec(dev);

	if (mpc == NULL) {

		printk("mpoa: (%s) mpc_push: unknown MPC\n", dev->name);

		pr_info("(%s) unknown MPC\n", dev->name);

		return;

	}



	if (memcmp(skb->data, &llc_snap_mpoa_data_tagged, sizeof(struct llc_snap_hdr)) == 0) { /* MPOA tagged data */

		ddprintk("mpoa: (%s) mpc_push: tagged data packet arrived\n", dev->name);

	if (memcmp(skb->data, &llc_snap_mpoa_data_tagged,

		   sizeof(struct llc_snap_hdr)) == 0) { /* MPOA tagged data */

		ddprintk("mpoa: (%s) mpc_push: tagged data packet arrived\n",

			 dev->name);



	} else if (memcmp(skb->data, &llc_snap_mpoa_data, sizeof(struct llc_snap_hdr)) == 0) { /* MPOA data */

		printk("mpoa: (%s) mpc_push: non-tagged data packet arrived\n", dev->name);

		printk("           mpc_push: non-tagged data unsupported, purging\n");

	} else if (memcmp(skb->data, &llc_snap_mpoa_data,

			  sizeof(struct llc_snap_hdr)) == 0) { /* MPOA data */

		pr_info("(%s) Unsupported non-tagged data packet arrived.  Purging\n",

			dev->name);

		dev_kfree_skb_any(skb);

		return;

	} else {

		printk("mpoa: (%s) mpc_push: garbage arrived, purging\n", dev->name);

		pr_info("(%s) garbage arrived, purging\n", dev->name);

		dev_kfree_skb_any(skb);

		return;

	}
@@ -700,7 +739,7 @@ static void mpc_push(struct atm_vcc *vcc, struct sk_buff *skb) 


	eg = mpc->eg_ops->get_by_tag(tag, mpc);

	if (eg == NULL) {

		printk("mpoa: (%s) mpc_push: Didn't find egress cache entry, tag = %u\n",

		pr_info("mpoa: (%s) Didn't find egress cache entry, tag = %u\n",

			dev->name, tag);

		purge_egress_shortcut(vcc, NULL);

		dev_kfree_skb_any(skb);
@@ -713,11 +752,13 @@ static void mpc_push(struct atm_vcc *vcc, struct sk_buff *skb) 
	 */

	if (eg->shortcut == NULL) {

		eg->shortcut = vcc;

		printk("mpoa: (%s) mpc_push: egress SVC in use\n", dev->name);

		pr_info("(%s) egress SVC in use\n", dev->name);

	}



	skb_pull(skb, sizeof(struct llc_snap_hdr) + sizeof(tag)); /* get rid of LLC/SNAP header */

	new_skb = skb_realloc_headroom(skb, eg->ctrl_info.DH_length); /* LLC/SNAP is shorter than MAC header :( */

	skb_pull(skb, sizeof(struct llc_snap_hdr) + sizeof(tag));

					/* get rid of LLC/SNAP header */

	new_skb = skb_realloc_headroom(skb, eg->ctrl_info.DH_length);

					/* LLC/SNAP is shorter than MAC header :( */

	dev_kfree_skb_any(skb);

	if (new_skb == NULL) {

		mpc->eg_ops->put(eg);
@@ -772,15 +813,17 @@ static int atm_mpoa_mpoad_attach (struct atm_vcc *vcc, int arg) 


	mpc = find_mpc_by_itfnum(arg);

	if (mpc == NULL) {

		dprintk("mpoa: mpoad_attach: allocating new mpc for itf %d\n", arg);

		dprintk("mpoa: mpoad_attach: allocating new mpc for itf %d\n",

			arg);

		mpc = alloc_mpc();

		if (mpc == NULL)

			return -ENOMEM;

		mpc->dev_num = arg;

		mpc->dev = find_lec_by_itfnum(arg); /* NULL if there was no lec */

		mpc->dev = find_lec_by_itfnum(arg);

					/* NULL if there was no lec */

	}

	if (mpc->mpoad_vcc) {

		printk("mpoa: mpoad_attach: mpoad is already present for itf %d\n", arg);

		pr_info("mpoad is already present for itf %d\n", arg);

		return -EADDRINUSE;

	}
@@ -835,11 +878,11 @@ static void mpoad_close(struct atm_vcc *vcc) 


	mpc = find_mpc_by_vcc(vcc);

	if (mpc == NULL) {

		printk("mpoa: mpoad_close: did not find MPC\n");

		pr_info("did not find MPC\n");

		return;

	}

	if (!mpc->mpoad_vcc) {

		printk("mpoa: mpoad_close: close for non-present mpoad\n");

		pr_info("close for non-present mpoad\n");

		return;

	}
@@ -859,7 +902,7 @@ static void mpoad_close(struct atm_vcc *vcc) 
		kfree_skb(skb);

	}



	printk("mpoa: (%s) going down\n",

	pr_info("(%s) going down\n",

		(mpc->dev) ? mpc->dev->name : "<unknown>");

	module_put(THIS_MODULE);
@@ -877,10 +920,11 @@ static int msg_from_mpoad(struct atm_vcc *vcc, struct sk_buff *skb) 
	atomic_sub(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);



	if (mpc == NULL) {

		printk("mpoa: msg_from_mpoad: no mpc found\n");

		pr_info("no mpc found\n");

		return 0;

	}

	dprintk("mpoa: (%s) msg_from_mpoad:", (mpc->dev) ? mpc->dev->name : "<unknown>");

	dprintk("mpoa: (%s) msg_from_mpoad:",

		(mpc->dev) ? mpc->dev->name : "<unknown>");

	switch (mesg->type) {

	case MPOA_RES_REPLY_RCVD:

		dprintk(" mpoa_res_reply_rcvd\n");
@@ -942,7 +986,7 @@ int msg_to_mpoad(struct k_message *mesg, struct mpoa_client *mpc) 
	struct sock *sk;



	if (mpc == NULL || !mpc->mpoad_vcc) {

		printk("mpoa: msg_to_mpoad: mesg %d to a non-existent mpoad\n", mesg->type);

		pr_info("mesg %d to a non-existent mpoad\n", mesg->type);

		return -ENXIO;

	}
@@ -960,7 +1004,8 @@ int msg_to_mpoad(struct k_message *mesg, struct mpoa_client *mpc) 
	return 0;

}



static int mpoa_event_listener(struct notifier_block *mpoa_notifier, unsigned long event, void *dev_ptr)

static int mpoa_event_listener(struct notifier_block *mpoa_notifier,

			       unsigned long event, void *dev_ptr)

{

	struct net_device *dev;

	struct mpoa_client *mpc;
@@ -986,7 +1031,7 @@ static int mpoa_event_listener(struct notifier_block *mpoa_notifier, unsigned lo 
				dev->name);

			mpc = alloc_mpc();

			if (mpc == NULL) {

				printk("mpoa: mpoa_event_listener: no new mpc");

				pr_info("no new mpc");

				break;

			}

		}
@@ -1010,9 +1055,8 @@ static int mpoa_event_listener(struct notifier_block *mpoa_notifier, unsigned lo 
		mpc = find_mpc_by_lec(dev);

		if (mpc == NULL)

			break;

		if (mpc->mpoad_vcc != NULL) {

		if (mpc->mpoad_vcc != NULL)

			start_mpc(mpc, dev);

		}

		break;

	case NETDEV_DOWN:

		/* the dev was ifconfig'ed down */
@@ -1022,9 +1066,8 @@ static int mpoa_event_listener(struct notifier_block *mpoa_notifier, unsigned lo 
		mpc = find_mpc_by_lec(dev);

		if (mpc == NULL)

			break;

		if (mpc->mpoad_vcc != NULL) {

		if (mpc->mpoad_vcc != NULL)

			stop_mpc(mpc);

		}

		break;

	case NETDEV_REBOOT:

	case NETDEV_CHANGE:
@@ -1072,7 +1115,7 @@ static void MPOA_trigger_rcvd(struct k_message *msg, struct mpoa_client *mpc) 
		return;

	}



	printk("mpoa: (%s) MPOA_trigger_rcvd: entry already in resolving state\n",

	pr_info("(%s) entry already in resolving state\n",

		(mpc->dev) ? mpc->dev->name : "<unknown>");

	mpc->in_ops->put(entry);

	return;
@@ -1082,7 +1125,9 @@ static void MPOA_trigger_rcvd(struct k_message *msg, struct mpoa_client *mpc) 
 * Things get complicated because we have to check if there's an egress

 * shortcut with suitable traffic parameters we could use.

 */

static void check_qos_and_open_shortcut(struct k_message *msg, struct mpoa_client *client, in_cache_entry *entry)

static void check_qos_and_open_shortcut(struct k_message *msg,

					struct mpoa_client *client,

					in_cache_entry *entry)

{

	__be32 dst_ip = msg->content.in_info.in_dst_ip;

	struct atm_mpoa_qos *qos = atm_mpoa_search_qos(dst_ip);
@@ -1109,12 +1154,13 @@ static void check_qos_and_open_shortcut(struct k_message *msg, struct mpoa_clien 


	/* No luck in the egress cache we must open an ingress SVC */

	msg->type = OPEN_INGRESS_SVC;

	if (qos && (qos->qos.txtp.traffic_class == msg->qos.txtp.traffic_class))

	{

	if (qos &&

	    (qos->qos.txtp.traffic_class == msg->qos.txtp.traffic_class)) {

		msg->qos = qos->qos;

		printk("mpoa: (%s) trying to get a CBR shortcut\n",client->dev->name);

	}

	else memset(&msg->qos,0,sizeof(struct atm_qos));

		pr_info("(%s) trying to get a CBR shortcut\n",

			client->dev->name);

	} else

		memset(&msg->qos, 0, sizeof(struct atm_qos));

	msg_to_mpoad(msg, client);

	return;

}
@@ -1126,15 +1172,17 @@ static void MPOA_res_reply_rcvd(struct k_message *msg, struct mpoa_client *mpc) 


	dprintk("mpoa: (%s) MPOA_res_reply_rcvd: ip %pI4\n",

		mpc->dev->name, &dst_ip);

	ddprintk("mpoa: (%s) MPOA_res_reply_rcvd() entry = %p", mpc->dev->name, entry);

	ddprintk("mpoa: (%s) MPOA_res_reply_rcvd() entry = %p",

		 mpc->dev->name, entry);

	if (entry == NULL) {

		printk("\nmpoa: (%s) ARGH, received res. reply for an entry that doesn't exist.\n", mpc->dev->name);

		pr_info("(%s) ARGH, received res. reply for an entry that doesn't exist.\n",

			mpc->dev->name);

		return;

	}

	ddprintk(" entry_state = %d ", entry->entry_state);



	if (entry->entry_state == INGRESS_RESOLVED) {

		printk("\nmpoa: (%s) MPOA_res_reply_rcvd for RESOLVED entry!\n", mpc->dev->name);

		pr_info("(%s) RESOLVED entry!\n", mpc->dev->name);

		mpc->in_ops->put(entry);

		return;

	}
@@ -1145,14 +1193,15 @@ static void MPOA_res_reply_rcvd(struct k_message *msg, struct mpoa_client *mpc) 
	entry->refresh_time = 0;

	ddprintk("entry->shortcut = %p\n", entry->shortcut);



	if(entry->entry_state == INGRESS_RESOLVING && entry->shortcut != NULL){

	if (entry->entry_state == INGRESS_RESOLVING &&

	    entry->shortcut != NULL) {

		entry->entry_state = INGRESS_RESOLVED;

		mpc->in_ops->put(entry);

		return; /* Shortcut already open... */

	}



	if (entry->shortcut != NULL) {

		printk("mpoa: (%s) MPOA_res_reply_rcvd: entry->shortcut != NULL, impossible!\n",

		pr_info("(%s) entry->shortcut != NULL, impossible!\n",

			mpc->dev->name);

		mpc->in_ops->put(entry);

		return;
@@ -1173,7 +1222,7 @@ static void ingress_purge_rcvd(struct k_message *msg, struct mpoa_client *mpc) 
	in_cache_entry *entry = mpc->in_ops->get_with_mask(dst_ip, mpc, mask);



	if (entry == NULL) {

		printk("mpoa: (%s) ingress_purge_rcvd: purge for a non-existing entry, ip = %pI4\n",

		pr_info("(%s) purge for a non-existing entry, ip = %pI4\n",

			mpc->dev->name, &dst_ip);

		return;

	}
@@ -1197,7 +1246,8 @@ static void egress_purge_rcvd(struct k_message *msg, struct mpoa_client *mpc) 
	eg_cache_entry *entry = mpc->eg_ops->get_by_cache_id(cache_id, mpc);



	if (entry == NULL) {

		dprintk("mpoa: (%s) egress_purge_rcvd: purge for a non-existing entry\n", mpc->dev->name);

		dprintk("mpoa: (%s) egress_purge_rcvd: purge for a non-existing entry\n",

			mpc->dev->name);

		return;

	}
@@ -1218,13 +1268,13 @@ static void purge_egress_shortcut(struct atm_vcc *vcc, eg_cache_entry *entry) 


	dprintk("mpoa: purge_egress_shortcut: entering\n");

	if (vcc == NULL) {

		printk("mpoa: purge_egress_shortcut: vcc == NULL\n");

		pr_info("vcc == NULL\n");

		return;

	}



	skb = alloc_skb(sizeof(struct k_message), GFP_ATOMIC);

	if (skb == NULL) {

		 printk("mpoa: purge_egress_shortcut: out of memory\n");

		pr_info("out of memory\n");

		return;

	}
@@ -1256,7 +1306,7 @@ static void mps_death( struct k_message * msg, struct mpoa_client * mpc ) 
	dprintk("mpoa: (%s) mps_death:\n", mpc->dev->name);



	if (memcmp(msg->MPS_ctrl, mpc->mps_ctrl_addr, ATM_ESA_LEN)) {

		printk("mpoa: (%s) mps_death: wrong MPS\n", mpc->dev->name);

		pr_info("(%s) wrong MPS\n", mpc->dev->name);

		return;

	}
@@ -1275,7 +1325,8 @@ static void mps_death( struct k_message * msg, struct mpoa_client * mpc ) 
	return;

}



static void MPOA_cache_impos_rcvd( struct k_message * msg, struct mpoa_client * mpc)

static void MPOA_cache_impos_rcvd(struct k_message *msg,

				  struct mpoa_client *mpc)

{

	uint16_t holding_time;

	eg_cache_entry *entry = mpc->eg_ops->get_by_cache_id(msg->content.eg_info.cache_id, mpc);
@@ -1302,7 +1353,8 @@ static void MPOA_cache_impos_rcvd( struct k_message * msg, struct mpoa_client * 
	return;

}



static void set_mpc_ctrl_addr_rcvd(struct k_message *mesg, struct mpoa_client *mpc)

static void set_mpc_ctrl_addr_rcvd(struct k_message *mesg,

				   struct mpoa_client *mpc)

{

	struct lec_priv *priv;

	int i, retval ;
@@ -1325,18 +1377,23 @@ static void set_mpc_ctrl_addr_rcvd(struct k_message *mesg, struct mpoa_client *m 


	if (mpc->dev) {

		priv = netdev_priv(mpc->dev);

		retval = priv->lane2_ops->associate_req(mpc->dev, mpc->dev->dev_addr, tlv, sizeof(tlv));

		retval = priv->lane2_ops->associate_req(mpc->dev,

							mpc->dev->dev_addr,

							tlv, sizeof(tlv));

		if (retval == 0)

			printk("mpoa: (%s) MPOA device type TLV association failed\n", mpc->dev->name);

			pr_info("(%s) MPOA device type TLV association failed\n",

				mpc->dev->name);

		retval = priv->lane2_ops->resolve(mpc->dev, NULL, 1, NULL, NULL);

		if (retval < 0)

			printk("mpoa: (%s) targetless LE_ARP request failed\n", mpc->dev->name);

			pr_info("(%s) targetless LE_ARP request failed\n",

				mpc->dev->name);

	}



	return;

}



static void set_mps_mac_addr_rcvd(struct k_message *msg, struct mpoa_client *client)

static void set_mps_mac_addr_rcvd(struct k_message *msg,

				  struct mpoa_client *client)

{



	if (client->number_of_mps_macs)
@@ -1344,7 +1401,7 @@ static void set_mps_mac_addr_rcvd(struct k_message *msg, struct mpoa_client *cli 
	client->number_of_mps_macs = 0;

	client->mps_macs = kmemdup(msg->MPS_ctrl, ETH_ALEN, GFP_KERNEL);

	if (client->mps_macs == NULL) {

		printk("mpoa: set_mps_mac_addr_rcvd: out of memory\n");

		pr_info("out of memory\n");

		return;

	}

	client->number_of_mps_macs = 1;
@@ -1397,11 +1454,13 @@ static void mpc_cache_check( unsigned long checking_time ) 
	while (mpc != NULL) {

		mpc->in_ops->clear_count(mpc);

		mpc->eg_ops->clear_expired(mpc);

		if(checking_time - previous_resolving_check_time > mpc->parameters.mpc_p4 * HZ ){

		if (checking_time - previous_resolving_check_time >

		    mpc->parameters.mpc_p4 * HZ) {

			mpc->in_ops->check_resolving(mpc);

			previous_resolving_check_time = checking_time;

		}

		if(checking_time - previous_refresh_time > mpc->parameters.mpc_p5 * HZ ){

		if (checking_time - previous_refresh_time >

		    mpc->parameters.mpc_p5 * HZ) {

			mpc->in_ops->refresh(mpc);

			previous_refresh_time = checking_time;

		}
@@ -1412,7 +1471,8 @@ static void mpc_cache_check( unsigned long checking_time ) 
	return;

}



static int atm_mpoa_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)

static int atm_mpoa_ioctl(struct socket *sock, unsigned int cmd,

			  unsigned long arg)

{

	int err = 0;

	struct atm_vcc *vcc = ATM_SD(sock);
@@ -1438,7 +1498,6 @@ static int atm_mpoa_ioctl(struct socket *sock, unsigned int cmd, unsigned long a 
	return err;

}





static struct atm_ioctl atm_ioctl_ops = {

	.owner	= THIS_MODULE,

	.ioctl	= atm_mpoa_ioctl,
@@ -1451,7 +1510,7 @@ static __init int atm_mpoa_init(void) 
	if (mpc_proc_init() != 0)

		pr_info("failed to initialize /proc/mpoa\n");



	printk("mpc.c: " __DATE__ " " __TIME__ " initialized\n");

	pr_info("mpc.c: " __DATE__ " " __TIME__ " initialized\n");



	return 0;

}