irda: move net/irda/ to drivers/staging/irda/net/

It's time to get rid of IRDA.  It's long been broken, and no one seems
to use it anymore.  So move it to staging and after a while, we can
delete it from there.

To start, move the network irda core from net/irda to
drivers/staging/irda/net/

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

10 files changed, 0 insertions, 3548 deletions

diff --git a/net/irda/irlan/Kconfig b/net/irda/irlan/Kconfig
deleted file mode 100644
index 951abc2e3a7f..000000000000
--- a/net/irda/irlan/Kconfig
+++ /dev/null
@@ -1,14 +0,0 @@
-config IRLAN
-	tristate "IrLAN protocol"
-	depends on IRDA
-	help
-	  Say Y here if you want to build support for the IrLAN protocol.
-	  To compile it as a module, choose M here: the module will be called
-	  irlan.  IrLAN emulates an Ethernet and makes it possible to put up
-	  a wireless LAN using infrared beams.
-
-	  The IrLAN protocol can be used to talk with infrared access points
-	  like the HP NetbeamIR, or the ESI JetEye NET.  You can also connect
-	  to another Linux machine running the IrLAN protocol for ad-hoc
-	  networking!
-
diff --git a/net/irda/irlan/Makefile b/net/irda/irlan/Makefile
deleted file mode 100644
index 94eefbc8e6b9..000000000000
--- a/net/irda/irlan/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Makefile for the Linux IrDA IrLAN protocol layer.
-#
-
-obj-$(CONFIG_IRLAN) += irlan.o
-
-irlan-y := irlan_common.o irlan_eth.o irlan_event.o irlan_client.o irlan_provider.o irlan_filter.o irlan_provider_event.o irlan_client_event.o
diff --git a/net/irda/irlan/irlan_client.c b/net/irda/irlan/irlan_client.c
deleted file mode 100644
index c5837a40c78e..000000000000
--- a/net/irda/irlan/irlan_client.c
+++ /dev/null
@@ -1,559 +0,0 @@
-/*********************************************************************
- *
- * Filename:      irlan_client.c
- * Version:       0.9
- * Description:   IrDA LAN Access Protocol (IrLAN) Client
- * Status:        Experimental.
- * Author:        Dag Brattli <dagb@cs.uit.no>
- * Created at:    Sun Aug 31 20:14:37 1997
- * Modified at:   Tue Dec 14 15:47:02 1999
- * Modified by:   Dag Brattli <dagb@cs.uit.no>
- * Sources:       skeleton.c by Donald Becker <becker@CESDIS.gsfc.nasa.gov>
- *                slip.c by Laurence Culhane, <loz@holmes.demon.co.uk>
- *                          Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
- *
- *     Copyright (c) 1998-1999 Dag Brattli <dagb@cs.uit.no>,
- *     All Rights Reserved.
- *
- *     This program is free software; you can redistribute it and/or
- *     modify it under the terms of the GNU General Public License as
- *     published by the Free Software Foundation; either version 2 of
- *     the License, or (at your option) any later version.
- *
- *     Neither Dag Brattli nor University of Tromsø admit liability nor
- *     provide warranty for any of this software. This material is
- *     provided "AS-IS" and at no charge.
- *
- ********************************************************************/
-
-#include <linux/kernel.h>
-#include <linux/string.h>
-#include <linux/slab.h>
-#include <linux/errno.h>
-#include <linux/init.h>
-#include <linux/netdevice.h>
-#include <linux/etherdevice.h>
-#include <linux/if_arp.h>
-#include <linux/bitops.h>
-#include <net/arp.h>
-
-#include <asm/byteorder.h>
-
-#include <net/irda/irda.h>
-#include <net/irda/irttp.h>
-#include <net/irda/irlmp.h>
-#include <net/irda/irias_object.h>
-#include <net/irda/iriap.h>
-#include <net/irda/timer.h>
-
-#include <net/irda/irlan_common.h>
-#include <net/irda/irlan_event.h>
-#include <net/irda/irlan_eth.h>
-#include <net/irda/irlan_provider.h>
-#include <net/irda/irlan_client.h>
-
-#undef CONFIG_IRLAN_GRATUITOUS_ARP
-
-static void irlan_client_ctrl_disconnect_indication(void *instance, void *sap,
-						    LM_REASON reason,
-						    struct sk_buff *);
-static int irlan_client_ctrl_data_indication(void *instance, void *sap,
-					     struct sk_buff *skb);
-static void irlan_client_ctrl_connect_confirm(void *instance, void *sap,
-					      struct qos_info *qos,
-					      __u32 max_sdu_size,
-					      __u8 max_header_size,
-					      struct sk_buff *);
-static void irlan_check_response_param(struct irlan_cb *self, char *param,
-				       char *value, int val_len);
-static void irlan_client_open_ctrl_tsap(struct irlan_cb *self);
-
-static void irlan_client_kick_timer_expired(void *data)
-{
-	struct irlan_cb *self = (struct irlan_cb *) data;
-
-	IRDA_ASSERT(self != NULL, return;);
-	IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
-
-	/*
-	 * If we are in peer mode, the client may not have got the discovery
-	 * indication it needs to make progress. If the client is still in
-	 * IDLE state, we must kick it to, but only if the provider is not IDLE
-	 */
-	if ((self->provider.access_type == ACCESS_PEER) &&
-	    (self->client.state == IRLAN_IDLE) &&
-	    (self->provider.state != IRLAN_IDLE)) {
-		irlan_client_wakeup(self, self->saddr, self->daddr);
-	}
-}
-
-static void irlan_client_start_kick_timer(struct irlan_cb *self, int timeout)
-{
-	irda_start_timer(&self->client.kick_timer, timeout, (void *) self,
-			 irlan_client_kick_timer_expired);
-}
-
-/*
- * Function irlan_client_wakeup (self, saddr, daddr)
- *
- *    Wake up client
- *
- */
-void irlan_client_wakeup(struct irlan_cb *self, __u32 saddr, __u32 daddr)
-{
-	IRDA_ASSERT(self != NULL, return;);
-	IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
-
-	/*
-	 * Check if we are already awake, or if we are a provider in direct
-	 * mode (in that case we must leave the client idle
-	 */
-	if ((self->client.state != IRLAN_IDLE) ||
-	    (self->provider.access_type == ACCESS_DIRECT))
-	{
-		pr_debug("%s(), already awake!\n", __func__);
-			return;
-	}
-
-	/* Addresses may have changed! */
-	self->saddr = saddr;
-	self->daddr = daddr;
-
-	if (self->disconnect_reason == LM_USER_REQUEST) {
-		pr_debug("%s(), still stopped by user\n", __func__);
-			return;
-	}
-
-	/* Open TSAPs */
-	irlan_client_open_ctrl_tsap(self);
-	irlan_open_data_tsap(self);
-
-	irlan_do_client_event(self, IRLAN_DISCOVERY_INDICATION, NULL);
-
-	/* Start kick timer */
-	irlan_client_start_kick_timer(self, 2*HZ);
-}
-
-/*
- * Function irlan_discovery_indication (daddr)
- *
- *    Remote device with IrLAN server support discovered
- *
- */
-void irlan_client_discovery_indication(discinfo_t *discovery,
-				       DISCOVERY_MODE mode,
-				       void *priv)
-{
-	struct irlan_cb *self;
-	__u32 saddr, daddr;
-
-	IRDA_ASSERT(discovery != NULL, return;);
-
-	/*
-	 * I didn't check it, but I bet that IrLAN suffer from the same
-	 * deficiency as IrComm and doesn't handle two instances
-	 * simultaneously connecting to each other.
-	 * Same workaround, drop passive discoveries.
-	 * Jean II */
-	if(mode == DISCOVERY_PASSIVE)
-		return;
-
-	saddr = discovery->saddr;
-	daddr = discovery->daddr;
-
-	/* Find instance */
-	rcu_read_lock();
-	self = irlan_get_any();
-	if (self) {
-		IRDA_ASSERT(self->magic == IRLAN_MAGIC, goto out;);
-
-		pr_debug("%s(), Found instance (%08x)!\n", __func__ ,
-			 daddr);
-
-		irlan_client_wakeup(self, saddr, daddr);
-	}
-IRDA_ASSERT_LABEL(out:)
-	rcu_read_unlock();
-}
-
-/*
- * Function irlan_client_data_indication (handle, skb)
- *
- *    This function gets the data that is received on the control channel
- *
- */
-static int irlan_client_ctrl_data_indication(void *instance, void *sap,
-					     struct sk_buff *skb)
-{
-	struct irlan_cb *self;
-
-	self = instance;
-
-	IRDA_ASSERT(self != NULL, return -1;);
-	IRDA_ASSERT(self->magic == IRLAN_MAGIC, return -1;);
-	IRDA_ASSERT(skb != NULL, return -1;);
-
-	irlan_do_client_event(self, IRLAN_DATA_INDICATION, skb);
-
-	/* Ready for a new command */
-	pr_debug("%s(), clearing tx_busy\n", __func__);
-	self->client.tx_busy = FALSE;
-
-	/* Check if we have some queued commands waiting to be sent */
-	irlan_run_ctrl_tx_queue(self);
-
-	return 0;
-}
-
-static void irlan_client_ctrl_disconnect_indication(void *instance, void *sap,
-						    LM_REASON reason,
-						    struct sk_buff *userdata)
-{
-	struct irlan_cb *self;
-	struct tsap_cb *tsap;
-	struct sk_buff *skb;
-
-	pr_debug("%s(), reason=%d\n", __func__ , reason);
-
-	self = instance;
-	tsap = sap;
-
-	IRDA_ASSERT(self != NULL, return;);
-	IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
-	IRDA_ASSERT(tsap != NULL, return;);
-	IRDA_ASSERT(tsap->magic == TTP_TSAP_MAGIC, return;);
-
-	IRDA_ASSERT(tsap == self->client.tsap_ctrl, return;);
-
-	/* Remove frames queued on the control channel */
-	while ((skb = skb_dequeue(&self->client.txq)) != NULL) {
-		dev_kfree_skb(skb);
-	}
-	self->client.tx_busy = FALSE;
-
-	irlan_do_client_event(self, IRLAN_LMP_DISCONNECT, NULL);
-}
-
-/*
- * Function irlan_client_open_tsaps (self)
- *
- *    Initialize callbacks and open IrTTP TSAPs
- *
- */
-static void irlan_client_open_ctrl_tsap(struct irlan_cb *self)
-{
-	struct tsap_cb *tsap;
-	notify_t notify;
-
-	IRDA_ASSERT(self != NULL, return;);
-	IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
-
-	/* Check if already open */
-	if (self->client.tsap_ctrl)
-		return;
-
-	irda_notify_init(&notify);
-
-	/* Set up callbacks */
-	notify.data_indication       = irlan_client_ctrl_data_indication;
-	notify.connect_confirm       = irlan_client_ctrl_connect_confirm;
-	notify.disconnect_indication = irlan_client_ctrl_disconnect_indication;
-	notify.instance = self;
-	strlcpy(notify.name, "IrLAN ctrl (c)", sizeof(notify.name));
-
-	tsap = irttp_open_tsap(LSAP_ANY, DEFAULT_INITIAL_CREDIT, &notify);
-	if (!tsap) {
-		pr_debug("%s(), Got no tsap!\n", __func__);
-		return;
-	}
-	self->client.tsap_ctrl = tsap;
-}
-
-/*
- * Function irlan_client_connect_confirm (handle, skb)
- *
- *    Connection to peer IrLAN laye confirmed
- *
- */
-static void irlan_client_ctrl_connect_confirm(void *instance, void *sap,
-					      struct qos_info *qos,
-					      __u32 max_sdu_size,
-					      __u8 max_header_size,
-					      struct sk_buff *skb)
-{
-	struct irlan_cb *self;
-
-	self = instance;
-
-	IRDA_ASSERT(self != NULL, return;);
-	IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
-
-	self->client.max_sdu_size = max_sdu_size;
-	self->client.max_header_size = max_header_size;
-
-	/* TODO: we could set the MTU depending on the max_sdu_size */
-
-	irlan_do_client_event(self, IRLAN_CONNECT_COMPLETE, NULL);
-}
-
-/*
- * Function print_ret_code (code)
- *
- *    Print return code of request to peer IrLAN layer.
- *
- */
-static void print_ret_code(__u8 code)
-{
-	switch(code) {
-	case 0:
-		printk(KERN_INFO "Success\n");
-		break;
-	case 1:
-		net_warn_ratelimited("IrLAN: Insufficient resources\n");
-		break;
-	case 2:
-		net_warn_ratelimited("IrLAN: Invalid command format\n");
-		break;
-	case 3:
-		net_warn_ratelimited("IrLAN: Command not supported\n");
-		break;
-	case 4:
-		net_warn_ratelimited("IrLAN: Parameter not supported\n");
-		break;
-	case 5:
-		net_warn_ratelimited("IrLAN: Value not supported\n");
-		break;
-	case 6:
-		net_warn_ratelimited("IrLAN: Not open\n");
-		break;
-	case 7:
-		net_warn_ratelimited("IrLAN: Authentication required\n");
-		break;
-	case 8:
-		net_warn_ratelimited("IrLAN: Invalid password\n");
-		break;
-	case 9:
-		net_warn_ratelimited("IrLAN: Protocol error\n");
-		break;
-	case 255:
-		net_warn_ratelimited("IrLAN: Asynchronous status\n");
-		break;
-	}
-}
-
-/*
- * Function irlan_client_parse_response (self, skb)
- *
- *    Extract all parameters from received buffer, then feed them to
- *    check_params for parsing
- */
-void irlan_client_parse_response(struct irlan_cb *self, struct sk_buff *skb)
-{
-	__u8 *frame;
-	__u8 *ptr;
-	int count;
-	int ret;
-	__u16 val_len;
-	int i;
-	char *name;
-	char *value;
-
-	IRDA_ASSERT(skb != NULL, return;);
-
-	pr_debug("%s() skb->len=%d\n", __func__ , (int)skb->len);
-
-	IRDA_ASSERT(self != NULL, return;);
-	IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
-
-	if (!skb) {
-		net_err_ratelimited("%s(), Got NULL skb!\n", __func__);
-		return;
-	}
-	frame = skb->data;
-
-	/*
-	 *  Check return code and print it if not success
-	 */
-	if (frame[0]) {
-		print_ret_code(frame[0]);
-		return;
-	}
-
-	name = kmalloc(255, GFP_ATOMIC);
-	if (!name)
-		return;
-	value = kmalloc(1016, GFP_ATOMIC);
-	if (!value) {
-		kfree(name);
-		return;
-	}
-
-	/* How many parameters? */
-	count = frame[1];
-
-	pr_debug("%s(), got %d parameters\n", __func__ , count);
-
-	ptr = frame+2;
-
-	/* For all parameters */
-	for (i=0; i<count;i++) {
-		ret = irlan_extract_param(ptr, name, value, &val_len);
-		if (ret < 0) {
-			pr_debug("%s(), IrLAN, Error!\n", __func__);
-			break;
-		}
-		ptr += ret;
-		irlan_check_response_param(self, name, value, val_len);
-	}
-	/* Cleanup */
-	kfree(name);
-	kfree(value);
-}
-
-/*
- * Function irlan_check_response_param (self, param, value, val_len)
- *
- *     Check which parameter is received and update local variables
- *
- */
-static void irlan_check_response_param(struct irlan_cb *self, char *param,
-				       char *value, int val_len)
-{
-	__u16 tmp_cpu; /* Temporary value in host order */
-	__u8 *bytes;
-	int i;
-
-	pr_debug("%s(), parm=%s\n", __func__ , param);
-
-	IRDA_ASSERT(self != NULL, return;);
-	IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
-
-	/* Media type */
-	if (strcmp(param, "MEDIA") == 0) {
-		if (strcmp(value, "802.3") == 0)
-			self->media = MEDIA_802_3;
-		else
-			self->media = MEDIA_802_5;
-		return;
-	}
-	if (strcmp(param, "FILTER_TYPE") == 0) {
-		if (strcmp(value, "DIRECTED") == 0)
-			self->client.filter_type |= IRLAN_DIRECTED;
-		else if (strcmp(value, "FUNCTIONAL") == 0)
-			self->client.filter_type |= IRLAN_FUNCTIONAL;
-		else if (strcmp(value, "GROUP") == 0)
-			self->client.filter_type |= IRLAN_GROUP;
-		else if (strcmp(value, "MAC_FRAME") == 0)
-			self->client.filter_type |= IRLAN_MAC_FRAME;
-		else if (strcmp(value, "MULTICAST") == 0)
-			self->client.filter_type |= IRLAN_MULTICAST;
-		else if (strcmp(value, "BROADCAST") == 0)
-			self->client.filter_type |= IRLAN_BROADCAST;
-		else if (strcmp(value, "IPX_SOCKET") == 0)
-			self->client.filter_type |= IRLAN_IPX_SOCKET;
-
-	}
-	if (strcmp(param, "ACCESS_TYPE") == 0) {
-		if (strcmp(value, "DIRECT") == 0)
-			self->client.access_type = ACCESS_DIRECT;
-		else if (strcmp(value, "PEER") == 0)
-			self->client.access_type = ACCESS_PEER;
-		else if (strcmp(value, "HOSTED") == 0)
-			self->client.access_type = ACCESS_HOSTED;
-		else {
-			pr_debug("%s(), unknown access type!\n", __func__);
-		}
-	}
-	/* IRLAN version */
-	if (strcmp(param, "IRLAN_VER") == 0) {
-		pr_debug("IrLAN version %d.%d\n", (__u8)value[0],
-			 (__u8)value[1]);
-
-		self->version[0] = value[0];
-		self->version[1] = value[1];
-		return;
-	}
-	/* Which remote TSAP to use for data channel */
-	if (strcmp(param, "DATA_CHAN") == 0) {
-		self->dtsap_sel_data = value[0];
-		pr_debug("Data TSAP = %02x\n", self->dtsap_sel_data);
-		return;
-	}
-	if (strcmp(param, "CON_ARB") == 0) {
-		memcpy(&tmp_cpu, value, 2); /* Align value */
-		le16_to_cpus(&tmp_cpu);     /* Convert to host order */
-		self->client.recv_arb_val = tmp_cpu;
-		pr_debug("%s(), receive arb val=%d\n", __func__ ,
-			 self->client.recv_arb_val);
-	}
-	if (strcmp(param, "MAX_FRAME") == 0) {
-		memcpy(&tmp_cpu, value, 2); /* Align value */
-		le16_to_cpus(&tmp_cpu);     /* Convert to host order */
-		self->client.max_frame = tmp_cpu;
-		pr_debug("%s(), max frame=%d\n", __func__ ,
-			 self->client.max_frame);
-	}
-
-	/* RECONNECT_KEY, in case the link goes down! */
-	if (strcmp(param, "RECONNECT_KEY") == 0) {
-		pr_debug("Got reconnect key: ");
-		/* for (i = 0; i < val_len; i++) */
-/* 			printk("%02x", value[i]); */
-		memcpy(self->client.reconnect_key, value, val_len);
-		self->client.key_len = val_len;
-		pr_debug("\n");
-	}
-	/* FILTER_ENTRY, have we got an ethernet address? */
-	if (strcmp(param, "FILTER_ENTRY") == 0) {
-		bytes = value;
-		pr_debug("Ethernet address = %pM\n", bytes);
-		for (i = 0; i < 6; i++)
-			self->dev->dev_addr[i] = bytes[i];
-	}
-}
-
-/*
- * Function irlan_client_get_value_confirm (obj_id, value)
- *
- *    Got results from remote LM-IAS
- *
- */
-void irlan_client_get_value_confirm(int result, __u16 obj_id,
-				    struct ias_value *value, void *priv)
-{
-	struct irlan_cb *self;
-
-	IRDA_ASSERT(priv != NULL, return;);
-
-	self = priv;
-	IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
-
-	/* We probably don't need to make any more queries */
-	iriap_close(self->client.iriap);
-	self->client.iriap = NULL;
-
-	/* Check if request succeeded */
-	if (result != IAS_SUCCESS) {
-		pr_debug("%s(), got NULL value!\n", __func__);
-		irlan_do_client_event(self, IRLAN_IAS_PROVIDER_NOT_AVAIL,
-				      NULL);
-		return;
-	}
-
-	switch (value->type) {
-	case IAS_INTEGER:
-		self->dtsap_sel_ctrl = value->t.integer;
-
-		if (value->t.integer != -1) {
-			irlan_do_client_event(self, IRLAN_IAS_PROVIDER_AVAIL,
-					      NULL);
-			return;
-		}
-		irias_delete_value(value);
-		break;
-	default:
-		pr_debug("%s(), unknown type!\n", __func__);
-		break;
-	}
-	irlan_do_client_event(self, IRLAN_IAS_PROVIDER_NOT_AVAIL, NULL);
-}
diff --git a/net/irda/irlan/irlan_client_event.c b/net/irda/irlan/irlan_client_event.c
deleted file mode 100644
index cc93fabbbb19..000000000000
--- a/net/irda/irlan/irlan_client_event.c
+++ /dev/null
@@ -1,511 +0,0 @@
-/*********************************************************************
- *
- * Filename:      irlan_client_event.c
- * Version:       0.9
- * Description:   IrLAN client state machine
- * Status:        Experimental.
- * Author:        Dag Brattli <dagb@cs.uit.no>
- * Created at:    Sun Aug 31 20:14:37 1997
- * Modified at:   Sun Dec 26 21:52:24 1999
- * Modified by:   Dag Brattli <dagb@cs.uit.no>
- *
- *     Copyright (c) 1998-1999 Dag Brattli <dagb@cs.uit.no>,
- *     All Rights Reserved.
- *
- *     This program is free software; you can redistribute it and/or
- *     modify it under the terms of the GNU General Public License as
- *     published by the Free Software Foundation; either version 2 of
- *     the License, or (at your option) any later version.
- *
- *     Neither Dag Brattli nor University of Tromsø admit liability nor
- *     provide warranty for any of this software. This material is
- *     provided "AS-IS" and at no charge.
- *
- ********************************************************************/
-
-#include <linux/skbuff.h>
-
-#include <net/irda/irda.h>
-#include <net/irda/timer.h>
-#include <net/irda/irmod.h>
-#include <net/irda/iriap.h>
-#include <net/irda/irlmp.h>
-#include <net/irda/irttp.h>
-
-#include <net/irda/irlan_common.h>
-#include <net/irda/irlan_client.h>
-#include <net/irda/irlan_event.h>
-
-static int irlan_client_state_idle (struct irlan_cb *self, IRLAN_EVENT event,
-				    struct sk_buff *skb);
-static int irlan_client_state_query(struct irlan_cb *self, IRLAN_EVENT event,
-				    struct sk_buff *skb);
-static int irlan_client_state_conn (struct irlan_cb *self, IRLAN_EVENT event,
-				    struct sk_buff *skb);
-static int irlan_client_state_info (struct irlan_cb *self, IRLAN_EVENT event,
-				    struct sk_buff *skb);
-static int irlan_client_state_media(struct irlan_cb *self, IRLAN_EVENT event,
-				    struct sk_buff *skb);
-static int irlan_client_state_open (struct irlan_cb *self, IRLAN_EVENT event,
-				    struct sk_buff *skb);
-static int irlan_client_state_wait (struct irlan_cb *self, IRLAN_EVENT event,
-				    struct sk_buff *skb);
-static int irlan_client_state_arb  (struct irlan_cb *self, IRLAN_EVENT event,
-				    struct sk_buff *skb);
-static int irlan_client_state_data (struct irlan_cb *self, IRLAN_EVENT event,
-				    struct sk_buff *skb);
-static int irlan_client_state_close(struct irlan_cb *self, IRLAN_EVENT event,
-				    struct sk_buff *skb);
-static int irlan_client_state_sync (struct irlan_cb *self, IRLAN_EVENT event,
-				    struct sk_buff *skb);
-
-static int (*state[])(struct irlan_cb *, IRLAN_EVENT event, struct sk_buff *) =
-{
-	irlan_client_state_idle,
-	irlan_client_state_query,
-	irlan_client_state_conn,
-	irlan_client_state_info,
-	irlan_client_state_media,
-	irlan_client_state_open,
-	irlan_client_state_wait,
-	irlan_client_state_arb,
-	irlan_client_state_data,
-	irlan_client_state_close,
-	irlan_client_state_sync
-};
-
-void irlan_do_client_event(struct irlan_cb *self, IRLAN_EVENT event,
-			   struct sk_buff *skb)
-{
-	IRDA_ASSERT(self != NULL, return;);
-	IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
-
-	(*state[ self->client.state]) (self, event, skb);
-}
-
-/*
- * Function irlan_client_state_idle (event, skb, info)
- *
- *    IDLE, We are waiting for an indication that there is a provider
- *    available.
- */
-static int irlan_client_state_idle(struct irlan_cb *self, IRLAN_EVENT event,
-				   struct sk_buff *skb)
-{
-	IRDA_ASSERT(self != NULL, return -1;);
-	IRDA_ASSERT(self->magic == IRLAN_MAGIC, return -1;);
-
-	switch (event) {
-	case IRLAN_DISCOVERY_INDICATION:
-		if (self->client.iriap) {
-			net_warn_ratelimited("%s(), busy with a previous query\n",
-					     __func__);
-			return -EBUSY;
-		}
-
-		self->client.iriap = iriap_open(LSAP_ANY, IAS_CLIENT, self,
-						irlan_client_get_value_confirm);
-		/* Get some values from peer IAS */
-		irlan_next_client_state(self, IRLAN_QUERY);
-		iriap_getvaluebyclass_request(self->client.iriap,
-					      self->saddr, self->daddr,
-					      "IrLAN", "IrDA:TinyTP:LsapSel");
-		break;
-	case IRLAN_WATCHDOG_TIMEOUT:
-		pr_debug("%s(), IRLAN_WATCHDOG_TIMEOUT\n", __func__);
-		break;
-	default:
-		pr_debug("%s(), Unknown event %d\n", __func__ , event);
-		break;
-	}
-	if (skb)
-		dev_kfree_skb(skb);
-
-	return 0;
-}
-
-/*
- * Function irlan_client_state_query (event, skb, info)
- *
- *    QUERY, We have queryed the remote IAS and is ready to connect
- *    to provider, just waiting for the confirm.
- *
- */
-static int irlan_client_state_query(struct irlan_cb *self, IRLAN_EVENT event,
-				    struct sk_buff *skb)
-{
-	IRDA_ASSERT(self != NULL, return -1;);
-	IRDA_ASSERT(self->magic == IRLAN_MAGIC, return -1;);
-
-	switch(event) {
-	case IRLAN_IAS_PROVIDER_AVAIL:
-		IRDA_ASSERT(self->dtsap_sel_ctrl != 0, return -1;);
-
-		self->client.open_retries = 0;
-
-		irttp_connect_request(self->client.tsap_ctrl,
-				      self->dtsap_sel_ctrl,
-				      self->saddr, self->daddr, NULL,
-				      IRLAN_MTU, NULL);
-		irlan_next_client_state(self, IRLAN_CONN);
-		break;
-	case IRLAN_IAS_PROVIDER_NOT_AVAIL:
-		pr_debug("%s(), IAS_PROVIDER_NOT_AVAIL\n", __func__);
-		irlan_next_client_state(self, IRLAN_IDLE);
-
-		/* Give the client a kick! */
-		if ((self->provider.access_type == ACCESS_PEER) &&
-		    (self->provider.state != IRLAN_IDLE))
-			irlan_client_wakeup(self, self->saddr, self->daddr);
-		break;
-	case IRLAN_LMP_DISCONNECT:
-	case IRLAN_LAP_DISCONNECT:
-		irlan_next_client_state(self, IRLAN_IDLE);
-		break;
-	case IRLAN_WATCHDOG_TIMEOUT:
-		pr_debug("%s(), IRLAN_WATCHDOG_TIMEOUT\n", __func__);
-		break;
-	default:
-		pr_debug("%s(), Unknown event %d\n", __func__ , event);
-		break;
-	}
-	if (skb)
-		dev_kfree_skb(skb);
-
-	return 0;
-}
-
-/*
- * Function irlan_client_state_conn (event, skb, info)
- *
- *    CONN, We have connected to a provider but has not issued any
- *    commands yet.
- *
- */
-static int irlan_client_state_conn(struct irlan_cb *self, IRLAN_EVENT event,
-				   struct sk_buff *skb)
-{
-	IRDA_ASSERT(self != NULL, return -1;);
-
-	switch (event) {
-	case IRLAN_CONNECT_COMPLETE:
-		/* Send getinfo cmd */
-		irlan_get_provider_info(self);
-		irlan_next_client_state(self, IRLAN_INFO);
-		break;
-	case IRLAN_LMP_DISCONNECT:
-	case IRLAN_LAP_DISCONNECT:
-		irlan_next_client_state(self, IRLAN_IDLE);
-		break;
-	case IRLAN_WATCHDOG_TIMEOUT:
-		pr_debug("%s(), IRLAN_WATCHDOG_TIMEOUT\n", __func__);
-		break;
-	default:
-		pr_debug("%s(), Unknown event %d\n", __func__ , event);
-		break;
-	}
-	if (skb)
-		dev_kfree_skb(skb);
-
-	return 0;
-}
-
-/*
- * Function irlan_client_state_info (self, event, skb, info)
- *
- *    INFO, We have issued a GetInfo command and is awaiting a reply.
- */
-static int irlan_client_state_info(struct irlan_cb *self, IRLAN_EVENT event,
-				   struct sk_buff *skb)
-{
-	IRDA_ASSERT(self != NULL, return -1;);
-
-	switch (event) {
-	case IRLAN_DATA_INDICATION:
-		IRDA_ASSERT(skb != NULL, return -1;);
-
-		irlan_client_parse_response(self, skb);
-
-		irlan_next_client_state(self, IRLAN_MEDIA);
-
-		irlan_get_media_char(self);
-		break;
-
-	case IRLAN_LMP_DISCONNECT:
-	case IRLAN_LAP_DISCONNECT:
-		irlan_next_client_state(self, IRLAN_IDLE);
-		break;
-	case IRLAN_WATCHDOG_TIMEOUT:
-		pr_debug("%s(), IRLAN_WATCHDOG_TIMEOUT\n", __func__);
-		break;
-	default:
-		pr_debug("%s(), Unknown event %d\n", __func__ , event);
-		break;
-	}
-	if (skb)
-		dev_kfree_skb(skb);
-
-	return 0;
-}
-
-/*
- * Function irlan_client_state_media (self, event, skb, info)
- *
- *    MEDIA, The irlan_client has issued a GetMedia command and is awaiting a
- *    reply.
- *
- */
-static int irlan_client_state_media(struct irlan_cb *self, IRLAN_EVENT event,
-				    struct sk_buff *skb)
-{
-	IRDA_ASSERT(self != NULL, return -1;);
-
-	switch(event) {
-	case IRLAN_DATA_INDICATION:
-		irlan_client_parse_response(self, skb);
-		irlan_open_data_channel(self);
-		irlan_next_client_state(self, IRLAN_OPEN);
-		break;
-	case IRLAN_LMP_DISCONNECT:
-	case IRLAN_LAP_DISCONNECT:
-		irlan_next_client_state(self, IRLAN_IDLE);
-		break;
-	case IRLAN_WATCHDOG_TIMEOUT:
-		pr_debug("%s(), IRLAN_WATCHDOG_TIMEOUT\n", __func__);
-		break;
-	default:
-		pr_debug("%s(), Unknown event %d\n", __func__ , event);
-		break;
-	}
-	if (skb)
-		dev_kfree_skb(skb);
-
-	return 0;
-}
-
-/*
- * Function irlan_client_state_open (self, event, skb, info)
- *
- *    OPEN, The irlan_client has issued a OpenData command and is awaiting a
- *    reply
- *
- */
-static int irlan_client_state_open(struct irlan_cb *self, IRLAN_EVENT event,
-				   struct sk_buff *skb)
-{
-	struct qos_info qos;
-
-	IRDA_ASSERT(self != NULL, return -1;);
-
-	switch(event) {
-	case IRLAN_DATA_INDICATION:
-		irlan_client_parse_response(self, skb);
-
-		/*
-		 *  Check if we have got the remote TSAP for data
-		 *  communications
-		 */
-		IRDA_ASSERT(self->dtsap_sel_data != 0, return -1;);
-
-		/* Check which access type we are dealing with */
-		switch (self->client.access_type) {
-		case ACCESS_PEER:
-		    if (self->provider.state == IRLAN_OPEN) {
-
-			    irlan_next_client_state(self, IRLAN_ARB);
-			    irlan_do_client_event(self, IRLAN_CHECK_CON_ARB,
-						  NULL);
-		    } else {
-
-			    irlan_next_client_state(self, IRLAN_WAIT);
-		    }
-		    break;
-		case ACCESS_DIRECT:
-		case ACCESS_HOSTED:
-			qos.link_disc_time.bits = 0x01; /* 3 secs */
-
-			irttp_connect_request(self->tsap_data,
-					      self->dtsap_sel_data,
-					      self->saddr, self->daddr, &qos,
-					      IRLAN_MTU, NULL);
-
-			irlan_next_client_state(self, IRLAN_DATA);
-			break;
-		default:
-			pr_debug("%s(), unknown access type!\n", __func__);
-			break;
-		}
-		break;
-	case IRLAN_LMP_DISCONNECT:
-	case IRLAN_LAP_DISCONNECT:
-		irlan_next_client_state(self, IRLAN_IDLE);
-		break;
-	case IRLAN_WATCHDOG_TIMEOUT:
-		pr_debug("%s(), IRLAN_WATCHDOG_TIMEOUT\n", __func__);
-		break;
-	default:
-		pr_debug("%s(), Unknown event %d\n", __func__ , event);
-		break;
-	}
-
-	if (skb)
-		dev_kfree_skb(skb);
-
-	return 0;
-}
-
-/*
- * Function irlan_client_state_wait (self, event, skb, info)
- *
- *    WAIT, The irlan_client is waiting for the local provider to enter the
- *    provider OPEN state.
- *
- */
-static int irlan_client_state_wait(struct irlan_cb *self, IRLAN_EVENT event,
-				   struct sk_buff *skb)
-{
-	IRDA_ASSERT(self != NULL, return -1;);
-
-	switch(event) {
-	case IRLAN_PROVIDER_SIGNAL:
-		irlan_next_client_state(self, IRLAN_ARB);
-		irlan_do_client_event(self, IRLAN_CHECK_CON_ARB, NULL);
-		break;
-	case IRLAN_LMP_DISCONNECT:
-	case IRLAN_LAP_DISCONNECT:
-		irlan_next_client_state(self, IRLAN_IDLE);
-		break;
-	case IRLAN_WATCHDOG_TIMEOUT:
-		pr_debug("%s(), IRLAN_WATCHDOG_TIMEOUT\n", __func__);
-		break;
-	default:
-		pr_debug("%s(), Unknown event %d\n", __func__ , event);
-		break;
-	}
-	if (skb)
-		dev_kfree_skb(skb);
-
-	return 0;
-}
-
-static int irlan_client_state_arb(struct irlan_cb *self, IRLAN_EVENT event,
-				  struct sk_buff *skb)
-{
-	struct qos_info qos;
-
-	IRDA_ASSERT(self != NULL, return -1;);
-
-	switch(event) {
-	case IRLAN_CHECK_CON_ARB:
-		if (self->client.recv_arb_val == self->provider.send_arb_val) {
-			irlan_next_client_state(self, IRLAN_CLOSE);
-			irlan_close_data_channel(self);
-		} else if (self->client.recv_arb_val <
-			   self->provider.send_arb_val)
-		{
-			qos.link_disc_time.bits = 0x01; /* 3 secs */
-
-			irlan_next_client_state(self, IRLAN_DATA);
-			irttp_connect_request(self->tsap_data,
-					      self->dtsap_sel_data,
-					      self->saddr, self->daddr, &qos,
-					      IRLAN_MTU, NULL);
-		} else if (self->client.recv_arb_val >
-			   self->provider.send_arb_val)
-		{
-			pr_debug("%s(), lost the battle :-(\n", __func__);
-		}
-		break;
-	case IRLAN_DATA_CONNECT_INDICATION:
-		irlan_next_client_state(self, IRLAN_DATA);
-		break;
-	case IRLAN_LMP_DISCONNECT:
-	case IRLAN_LAP_DISCONNECT:
-		irlan_next_client_state(self, IRLAN_IDLE);
-		break;
-	case IRLAN_WATCHDOG_TIMEOUT:
-		pr_debug("%s(), IRLAN_WATCHDOG_TIMEOUT\n", __func__);
-		break;
-	default:
-		pr_debug("%s(), Unknown event %d\n", __func__ , event);
-		break;
-	}
-	if (skb)
-		dev_kfree_skb(skb);
-
-	return 0;
-}
-
-/*
- * Function irlan_client_state_data (self, event, skb, info)
- *
- *    DATA, The data channel is connected, allowing data transfers between
- *    the local and remote machines.
- *
- */
-static int irlan_client_state_data(struct irlan_cb *self, IRLAN_EVENT event,
-				   struct sk_buff *skb)
-{
-	IRDA_ASSERT(self != NULL, return -1;);
-	IRDA_ASSERT(self->magic == IRLAN_MAGIC, return -1;);
-
-	switch(event) {
-	case IRLAN_DATA_INDICATION:
-		irlan_client_parse_response(self, skb);
-		break;
-	case IRLAN_LMP_DISCONNECT: /* FALLTHROUGH */
-	case IRLAN_LAP_DISCONNECT:
-		irlan_next_client_state(self, IRLAN_IDLE);
-		break;
-	default:
-		pr_debug("%s(), Unknown event %d\n", __func__ , event);
-		break;
-	}
-	if (skb)
-		dev_kfree_skb(skb);
-
-	return 0;
-}
-
-/*
- * Function irlan_client_state_close (self, event, skb, info)
- *
- *
- *
- */
-static int irlan_client_state_close(struct irlan_cb *self, IRLAN_EVENT event,
-				    struct sk_buff *skb)
-{
-	if (skb)
-		dev_kfree_skb(skb);
-
-	return 0;
-}
-
-/*
- * Function irlan_client_state_sync (self, event, skb, info)
- *
- *
- *
- */
-static int irlan_client_state_sync(struct irlan_cb *self, IRLAN_EVENT event,
-				   struct sk_buff *skb)
-{
-	if (skb)
-		dev_kfree_skb(skb);
-
-	return 0;
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/net/irda/irlan/irlan_common.c b/net/irda/irlan/irlan_common.c
deleted file mode 100644
index 481bbc2a4349..000000000000
--- a/net/irda/irlan/irlan_common.c
+++ /dev/null
@@ -1,1176 +0,0 @@
-/*********************************************************************
- *
- * Filename:      irlan_common.c
- * Version:       0.9
- * Description:   IrDA LAN Access Protocol Implementation
- * Status:        Experimental.
- * Author:        Dag Brattli <dagb@cs.uit.no>
- * Created at:    Sun Aug 31 20:14:37 1997
- * Modified at:   Sun Dec 26 21:53:10 1999
- * Modified by:   Dag Brattli <dagb@cs.uit.no>
- *
- *     Copyright (c) 1997, 1999 Dag Brattli <dagb@cs.uit.no>,
- *     All Rights Reserved.
- *
- *     This program is free software; you can redistribute it and/or
- *     modify it under the terms of the GNU General Public License as
- *     published by the Free Software Foundation; either version 2 of
- *     the License, or (at your option) any later version.
- *
- *     Neither Dag Brattli nor University of Tromsø admit liability nor
- *     provide warranty for any of this software. This material is
- *     provided "AS-IS" and at no charge.
- *
- ********************************************************************/
-
-#include <linux/module.h>
-
-#include <linux/kernel.h>
-#include <linux/string.h>
-#include <linux/gfp.h>
-#include <linux/init.h>
-#include <linux/errno.h>
-#include <linux/proc_fs.h>
-#include <linux/sched.h>
-#include <linux/seq_file.h>
-#include <linux/random.h>
-#include <linux/netdevice.h>
-#include <linux/etherdevice.h>
-#include <linux/rtnetlink.h>
-#include <linux/moduleparam.h>
-#include <linux/bitops.h>
-
-#include <asm/byteorder.h>
-
-#include <net/irda/irda.h>
-#include <net/irda/irttp.h>
-#include <net/irda/irlmp.h>
-#include <net/irda/iriap.h>
-#include <net/irda/timer.h>
-
-#include <net/irda/irlan_common.h>
-#include <net/irda/irlan_client.h>
-#include <net/irda/irlan_provider.h>
-#include <net/irda/irlan_eth.h>
-#include <net/irda/irlan_filter.h>
-
-
-/* extern char sysctl_devname[]; */
-
-/*
- *  Master structure
- */
-static LIST_HEAD(irlans);
-
-static void *ckey;
-static void *skey;
-
-/* Module parameters */
-static bool eth;   /* Use "eth" or "irlan" name for devices */
-static int access = ACCESS_PEER; /* PEER, DIRECT or HOSTED */
-
-#ifdef CONFIG_PROC_FS
-static const char *const irlan_access[] = {
-	"UNKNOWN",
-	"DIRECT",
-	"PEER",
-	"HOSTED"
-};
-
-static const char *const irlan_media[] = {
-	"UNKNOWN",
-	"802.3",
-	"802.5"
-};
-
-extern struct proc_dir_entry *proc_irda;
-
-static int irlan_seq_open(struct inode *inode, struct file *file);
-
-static const struct file_operations irlan_fops = {
-	.owner	 = THIS_MODULE,
-	.open    = irlan_seq_open,
-	.read    = seq_read,
-	.llseek  = seq_lseek,
-	.release = seq_release,
-};
-
-extern struct proc_dir_entry *proc_irda;
-#endif /* CONFIG_PROC_FS */
-
-static struct irlan_cb __init *irlan_open(__u32 saddr, __u32 daddr);
-static void __irlan_close(struct irlan_cb *self);
-static int __irlan_insert_param(struct sk_buff *skb, char *param, int type,
-				__u8 value_byte, __u16 value_short,
-				__u8 *value_array, __u16 value_len);
-static void irlan_open_unicast_addr(struct irlan_cb *self);
-static void irlan_get_unicast_addr(struct irlan_cb *self);
-void irlan_close_tsaps(struct irlan_cb *self);
-
-/*
- * Function irlan_init (void)
- *
- *    Initialize IrLAN layer
- *
- */
-static int __init irlan_init(void)
-{
-	struct irlan_cb *new;
-	__u16 hints;
-
-#ifdef CONFIG_PROC_FS
-	{ struct proc_dir_entry *proc;
-	proc = proc_create("irlan", 0, proc_irda, &irlan_fops);
-	if (!proc) {
-		printk(KERN_ERR "irlan_init: can't create /proc entry!\n");
-		return -ENODEV;
-	}
-	}
-#endif /* CONFIG_PROC_FS */
-
-	hints = irlmp_service_to_hint(S_LAN);
-
-	/* Register with IrLMP as a client */
-	ckey = irlmp_register_client(hints, &irlan_client_discovery_indication,
-				     NULL, NULL);
-	if (!ckey)
-		goto err_ckey;
-
-	/* Register with IrLMP as a service */
-	skey = irlmp_register_service(hints);
-	if (!skey)
-		goto err_skey;
-
-	/* Start the master IrLAN instance (the only one for now) */
-	new = irlan_open(DEV_ADDR_ANY, DEV_ADDR_ANY);
-	if (!new)
-		goto err_open;
-
-	/* The master will only open its (listen) control TSAP */
-	irlan_provider_open_ctrl_tsap(new);
-
-	/* Do some fast discovery! */
-	irlmp_discovery_request(DISCOVERY_DEFAULT_SLOTS);
-
-	return 0;
-
-err_open:
-	irlmp_unregister_service(skey);
-err_skey:
-	irlmp_unregister_client(ckey);
-err_ckey:
-#ifdef CONFIG_PROC_FS
-	remove_proc_entry("irlan", proc_irda);
-#endif /* CONFIG_PROC_FS */
-
-	return -ENOMEM;
-}
-
-static void __exit irlan_cleanup(void)
-{
-	struct irlan_cb *self, *next;
-
-	irlmp_unregister_client(ckey);
-	irlmp_unregister_service(skey);
-
-#ifdef CONFIG_PROC_FS
-	remove_proc_entry("irlan", proc_irda);
-#endif /* CONFIG_PROC_FS */
-
-	/* Cleanup any leftover network devices */
-	rtnl_lock();
-	list_for_each_entry_safe(self, next, &irlans, dev_list) {
-		__irlan_close(self);
-	}
-	rtnl_unlock();
-}
-
-/*
- * Function irlan_open (void)
- *
- *    Open new instance of a client/provider, we should only register the
- *    network device if this instance is ment for a particular client/provider
- */
-static struct irlan_cb __init *irlan_open(__u32 saddr, __u32 daddr)
-{
-	struct net_device *dev;
-	struct irlan_cb *self;
-
-	/* Create network device with irlan */
-	dev = alloc_irlandev(eth ? "eth%d" : "irlan%d");
-	if (!dev)
-		return NULL;
-
-	self = netdev_priv(dev);
-	self->dev = dev;
-
-	/*
-	 *  Initialize local device structure
-	 */
-	self->magic = IRLAN_MAGIC;
-	self->saddr = saddr;
-	self->daddr = daddr;
-
-	/* Provider access can only be PEER, DIRECT, or HOSTED */
-	self->provider.access_type = access;
-	if (access == ACCESS_DIRECT) {
-		/*
-		 * Since we are emulating an IrLAN sever we will have to
-		 * give ourself an ethernet address!
-		 */
-		dev->dev_addr[0] = 0x40;
-		dev->dev_addr[1] = 0x00;
-		dev->dev_addr[2] = 0x00;
-		dev->dev_addr[3] = 0x00;
-		get_random_bytes(dev->dev_addr+4, 1);
-		get_random_bytes(dev->dev_addr+5, 1);
-	}
-
-	self->media = MEDIA_802_3;
-	self->disconnect_reason = LM_USER_REQUEST;
-	init_timer(&self->watchdog_timer);
-	init_timer(&self->client.kick_timer);
-	init_waitqueue_head(&self->open_wait);
-
-	skb_queue_head_init(&self->client.txq);
-
-	irlan_next_client_state(self, IRLAN_IDLE);
-	irlan_next_provider_state(self, IRLAN_IDLE);
-
-	if (register_netdev(dev)) {
-		pr_debug("%s(), register_netdev() failed!\n",
-			 __func__);
-		self = NULL;
-		free_netdev(dev);
-	} else {
-		rtnl_lock();
-		list_add_rcu(&self->dev_list, &irlans);
-		rtnl_unlock();
-	}
-
-	return self;
-}
-/*
- * Function __irlan_close (self)
- *
- *    This function closes and deallocates the IrLAN client instances. Be
- *    aware that other functions which calls client_close() must
- *    remove self from irlans list first.
- */
-static void __irlan_close(struct irlan_cb *self)
-{
-	ASSERT_RTNL();
-	IRDA_ASSERT(self != NULL, return;);
-	IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
-
-	del_timer_sync(&self->watchdog_timer);
-	del_timer_sync(&self->client.kick_timer);
-
-	/* Close all open connections and remove TSAPs */
-	irlan_close_tsaps(self);
-
-	if (self->client.iriap)
-		iriap_close(self->client.iriap);
-
-	/* Remove frames queued on the control channel */
-	skb_queue_purge(&self->client.txq);
-
-	/* Unregister and free self via destructor */
-	unregister_netdevice(self->dev);
-}
-
-/* Find any instance of irlan, used for client discovery wakeup */
-struct irlan_cb *irlan_get_any(void)
-{
-	struct irlan_cb *self;
-
-	list_for_each_entry_rcu(self, &irlans, dev_list) {
-		return self;
-	}
-	return NULL;
-}
-
-/*
- * Function irlan_connect_indication (instance, sap, qos, max_sdu_size, skb)
- *
- *    Here we receive the connect indication for the data channel
- *
- */
-static void irlan_connect_indication(void *instance, void *sap,
-				     struct qos_info *qos,
-				     __u32 max_sdu_size,
-				     __u8 max_header_size,
-				     struct sk_buff *skb)
-{
-	struct irlan_cb *self;
-	struct tsap_cb *tsap;
-
-	self = instance;
-	tsap = sap;
-
-	IRDA_ASSERT(self != NULL, return;);
-	IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
-	IRDA_ASSERT(tsap == self->tsap_data,return;);
-
-	self->max_sdu_size = max_sdu_size;
-	self->max_header_size = max_header_size;
-
-	pr_debug("%s: We are now connected!\n", __func__);
-
-	del_timer(&self->watchdog_timer);
-
-	/* If you want to pass the skb to *both* state machines, you will
-	 * need to skb_clone() it, so that you don't free it twice.
-	 * As the state machines don't need it, git rid of it here...
-	 * Jean II */
-	if (skb)
-		dev_kfree_skb(skb);
-
-	irlan_do_provider_event(self, IRLAN_DATA_CONNECT_INDICATION, NULL);
-	irlan_do_client_event(self, IRLAN_DATA_CONNECT_INDICATION, NULL);
-
-	if (self->provider.access_type == ACCESS_PEER) {
-		/*
-		 * Data channel is open, so we are now allowed to
-		 * configure the remote filter
-		 */
-		irlan_get_unicast_addr(self);
-		irlan_open_unicast_addr(self);
-	}
-	/* Ready to transfer Ethernet frames (at last) */
-	netif_start_queue(self->dev); /* Clear reason */
-}
-
-static void irlan_connect_confirm(void *instance, void *sap,
-				  struct qos_info *qos,
-				  __u32 max_sdu_size,
-				  __u8 max_header_size,
-				  struct sk_buff *skb)
-{
-	struct irlan_cb *self;
-
-	self = instance;
-
-	IRDA_ASSERT(self != NULL, return;);
-	IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
-
-	self->max_sdu_size = max_sdu_size;
-	self->max_header_size = max_header_size;
-
-	/* TODO: we could set the MTU depending on the max_sdu_size */
-
-	pr_debug("%s: We are now connected!\n", __func__);
-	del_timer(&self->watchdog_timer);
-
-	/*
-	 * Data channel is open, so we are now allowed to configure the remote
-	 * filter
-	 */
-	irlan_get_unicast_addr(self);
-	irlan_open_unicast_addr(self);
-
-	/* Open broadcast and multicast filter by default */
-	irlan_set_broadcast_filter(self, TRUE);
-	irlan_set_multicast_filter(self, TRUE);
-
-	/* Ready to transfer Ethernet frames */
-	netif_start_queue(self->dev);
-	self->disconnect_reason = 0; /* Clear reason */
-	wake_up_interruptible(&self->open_wait);
-}
-
-/*
- * Function irlan_client_disconnect_indication (handle)
- *
- *    Callback function for the IrTTP layer. Indicates a disconnection of
- *    the specified connection (handle)
- */
-static void irlan_disconnect_indication(void *instance,
-					void *sap, LM_REASON reason,
-					struct sk_buff *userdata)
-{
-	struct irlan_cb *self;
-	struct tsap_cb *tsap;
-
-	pr_debug("%s(), reason=%d\n", __func__ , reason);
-
-	self = instance;
-	tsap = sap;
-
-	IRDA_ASSERT(self != NULL, return;);
-	IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
-	IRDA_ASSERT(tsap != NULL, return;);
-	IRDA_ASSERT(tsap->magic == TTP_TSAP_MAGIC, return;);
-
-	IRDA_ASSERT(tsap == self->tsap_data, return;);
-
-	pr_debug("IrLAN, data channel disconnected by peer!\n");
-
-	/* Save reason so we know if we should try to reconnect or not */
-	self->disconnect_reason = reason;
-
-	switch (reason) {
-	case LM_USER_REQUEST: /* User request */
-		pr_debug("%s(), User requested\n", __func__);
-		break;
-	case LM_LAP_DISCONNECT: /* Unexpected IrLAP disconnect */
-		pr_debug("%s(), Unexpected IrLAP disconnect\n", __func__);
-		break;
-	case LM_CONNECT_FAILURE: /* Failed to establish IrLAP connection */
-		pr_debug("%s(), IrLAP connect failed\n", __func__);
-		break;
-	case LM_LAP_RESET:  /* IrLAP reset */
-		pr_debug("%s(), IrLAP reset\n", __func__);
-		break;
-	case LM_INIT_DISCONNECT:
-		pr_debug("%s(), IrLMP connect failed\n", __func__);
-		break;
-	default:
-		net_err_ratelimited("%s(), Unknown disconnect reason\n",
-				    __func__);
-		break;
-	}
-
-	/* If you want to pass the skb to *both* state machines, you will
-	 * need to skb_clone() it, so that you don't free it twice.
-	 * As the state machines don't need it, git rid of it here...
-	 * Jean II */
-	if (userdata)
-		dev_kfree_skb(userdata);
-
-	irlan_do_client_event(self, IRLAN_LMP_DISCONNECT, NULL);
-	irlan_do_provider_event(self, IRLAN_LMP_DISCONNECT, NULL);
-
-	wake_up_interruptible(&self->open_wait);
-}
-
-void irlan_open_data_tsap(struct irlan_cb *self)
-{
-	struct tsap_cb *tsap;
-	notify_t notify;
-
-	IRDA_ASSERT(self != NULL, return;);
-	IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
-
-	/* Check if already open */
-	if (self->tsap_data)
-		return;
-
-	irda_notify_init(&notify);
-
-	notify.data_indication       = irlan_eth_receive;
-	notify.udata_indication      = irlan_eth_receive;
-	notify.connect_indication    = irlan_connect_indication;
-	notify.connect_confirm       = irlan_connect_confirm;
-	notify.flow_indication       = irlan_eth_flow_indication;
-	notify.disconnect_indication = irlan_disconnect_indication;
-	notify.instance              = self;
-	strlcpy(notify.name, "IrLAN data", sizeof(notify.name));
-
-	tsap = irttp_open_tsap(LSAP_ANY, DEFAULT_INITIAL_CREDIT, &notify);
-	if (!tsap) {
-		pr_debug("%s(), Got no tsap!\n", __func__);
-		return;
-	}
-	self->tsap_data = tsap;
-
-	/*
-	 *  This is the data TSAP selector which we will pass to the client
-	 *  when the client ask for it.
-	 */
-	self->stsap_sel_data = self->tsap_data->stsap_sel;
-}
-
-void irlan_close_tsaps(struct irlan_cb *self)
-{
-	IRDA_ASSERT(self != NULL, return;);
-	IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
-
-	/* Disconnect and close all open TSAP connections */
-	if (self->tsap_data) {
-		irttp_disconnect_request(self->tsap_data, NULL, P_NORMAL);
-		irttp_close_tsap(self->tsap_data);
-		self->tsap_data = NULL;
-	}
-	if (self->client.tsap_ctrl) {
-		irttp_disconnect_request(self->client.tsap_ctrl, NULL,
-					 P_NORMAL);
-		irttp_close_tsap(self->client.tsap_ctrl);
-		self->client.tsap_ctrl = NULL;
-	}
-	if (self->provider.tsap_ctrl) {
-		irttp_disconnect_request(self->provider.tsap_ctrl, NULL,
-					 P_NORMAL);
-		irttp_close_tsap(self->provider.tsap_ctrl);
-		self->provider.tsap_ctrl = NULL;
-	}
-	self->disconnect_reason = LM_USER_REQUEST;
-}
-
-/*
- * Function irlan_ias_register (self, tsap_sel)
- *
- *    Register with LM-IAS
- *
- */
-void irlan_ias_register(struct irlan_cb *self, __u8 tsap_sel)
-{
-	struct ias_object *obj;
-	struct ias_value *new_value;
-
-	IRDA_ASSERT(self != NULL, return;);
-	IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
-
-	/*
-	 * Check if object has already been registered by a previous provider.
-	 * If that is the case, we just change the value of the attribute
-	 */
-	if (!irias_find_object("IrLAN")) {
-		obj = irias_new_object("IrLAN", IAS_IRLAN_ID);
-		irias_add_integer_attrib(obj, "IrDA:TinyTP:LsapSel", tsap_sel,
-					 IAS_KERNEL_ATTR);
-		irias_insert_object(obj);
-	} else {
-		new_value = irias_new_integer_value(tsap_sel);
-		irias_object_change_attribute("IrLAN", "IrDA:TinyTP:LsapSel",
-					      new_value);
-	}
-
-	/* Register PnP object only if not registered before */
-	if (!irias_find_object("PnP")) {
-		obj = irias_new_object("PnP", IAS_PNP_ID);
-#if 0
-		irias_add_string_attrib(obj, "Name", sysctl_devname,
-					IAS_KERNEL_ATTR);
-#else
-		irias_add_string_attrib(obj, "Name", "Linux", IAS_KERNEL_ATTR);
-#endif
-		irias_add_string_attrib(obj, "DeviceID", "HWP19F0",
-					IAS_KERNEL_ATTR);
-		irias_add_integer_attrib(obj, "CompCnt", 1, IAS_KERNEL_ATTR);
-		if (self->provider.access_type == ACCESS_PEER)
-			irias_add_string_attrib(obj, "Comp#01", "PNP8389",
-						IAS_KERNEL_ATTR);
-		else
-			irias_add_string_attrib(obj, "Comp#01", "PNP8294",
-						IAS_KERNEL_ATTR);
-
-		irias_add_string_attrib(obj, "Manufacturer",
-					"Linux-IrDA Project", IAS_KERNEL_ATTR);
-		irias_insert_object(obj);
-	}
-}
-
-/*
- * Function irlan_run_ctrl_tx_queue (self)
- *
- *    Try to send the next command in the control transmit queue
- *
- */
-int irlan_run_ctrl_tx_queue(struct irlan_cb *self)
-{
-	struct sk_buff *skb;
-
-	if (irda_lock(&self->client.tx_busy) == FALSE)
-		return -EBUSY;
-
-	skb = skb_dequeue(&self->client.txq);
-	if (!skb) {
-		self->client.tx_busy = FALSE;
-		return 0;
-	}
-
-	/* Check that it's really possible to send commands */
-	if ((self->client.tsap_ctrl == NULL) ||
-	    (self->client.state == IRLAN_IDLE))
-	{
-		self->client.tx_busy = FALSE;
-		dev_kfree_skb(skb);
-		return -1;
-	}
-	pr_debug("%s(), sending ...\n", __func__);
-
-	return irttp_data_request(self->client.tsap_ctrl, skb);
-}
-
-/*
- * Function irlan_ctrl_data_request (self, skb)
- *
- *    This function makes sure that commands on the control channel is being
- *    sent in a command/response fashion
- */
-static void irlan_ctrl_data_request(struct irlan_cb *self, struct sk_buff *skb)
-{
-	/* Queue command */
-	skb_queue_tail(&self->client.txq, skb);
-
-	/* Try to send command */
-	irlan_run_ctrl_tx_queue(self);
-}
-
-/*
- * Function irlan_get_provider_info (self)
- *
- *    Send Get Provider Information command to peer IrLAN layer
- *
- */
-void irlan_get_provider_info(struct irlan_cb *self)
-{
-	struct sk_buff *skb;
-	__u8 *frame;
-
-	IRDA_ASSERT(self != NULL, return;);
-	IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
-
-	skb = alloc_skb(IRLAN_MAX_HEADER + IRLAN_CMD_HEADER,
-			GFP_ATOMIC);
-	if (!skb)
-		return;
-
-	/* Reserve space for TTP, LMP, and LAP header */
-	skb_reserve(skb, self->client.max_header_size);
-	skb_put(skb, 2);
-
-	frame = skb->data;
-
-	frame[0] = CMD_GET_PROVIDER_INFO;
-	frame[1] = 0x00;                 /* Zero parameters */
-
-	irlan_ctrl_data_request(self, skb);
-}
-
-/*
- * Function irlan_open_data_channel (self)
- *
- *    Send an Open Data Command to provider
- *
- */
-void irlan_open_data_channel(struct irlan_cb *self)
-{
-	struct sk_buff *skb;
-	__u8 *frame;
-
-	IRDA_ASSERT(self != NULL, return;);
-	IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
-
-	skb = alloc_skb(IRLAN_MAX_HEADER + IRLAN_CMD_HEADER +
-			IRLAN_STRING_PARAMETER_LEN("MEDIA", "802.3") +
-			IRLAN_STRING_PARAMETER_LEN("ACCESS_TYPE", "DIRECT"),
-			GFP_ATOMIC);
-	if (!skb)
-		return;
-
-	skb_reserve(skb, self->client.max_header_size);
-	skb_put(skb, 2);
-
-	frame = skb->data;
-
-	/* Build frame */
-	frame[0] = CMD_OPEN_DATA_CHANNEL;
-	frame[1] = 0x02; /* Two parameters */
-
-	irlan_insert_string_param(skb, "MEDIA", "802.3");
-	irlan_insert_string_param(skb, "ACCESS_TYPE", "DIRECT");
-	/* irlan_insert_string_param(skb, "MODE", "UNRELIABLE"); */
-
-/* 	self->use_udata = TRUE; */
-
-	irlan_ctrl_data_request(self, skb);
-}
-
-void irlan_close_data_channel(struct irlan_cb *self)
-{
-	struct sk_buff *skb;
-	__u8 *frame;
-
-	IRDA_ASSERT(self != NULL, return;);
-	IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
-
-	/* Check if the TSAP is still there */
-	if (self->client.tsap_ctrl == NULL)
-		return;
-
-	skb = alloc_skb(IRLAN_MAX_HEADER + IRLAN_CMD_HEADER +
-			IRLAN_BYTE_PARAMETER_LEN("DATA_CHAN"),
-			GFP_ATOMIC);
-	if (!skb)
-		return;
-
-	skb_reserve(skb, self->client.max_header_size);
-	skb_put(skb, 2);
-
-	frame = skb->data;
-
-	/* Build frame */
-	frame[0] = CMD_CLOSE_DATA_CHAN;
-	frame[1] = 0x01; /* One parameter */
-
-	irlan_insert_byte_param(skb, "DATA_CHAN", self->dtsap_sel_data);
-
-	irlan_ctrl_data_request(self, skb);
-}
-
-/*
- * Function irlan_open_unicast_addr (self)
- *
- *    Make IrLAN provider accept ethernet frames addressed to the unicast
- *    address.
- *
- */
-static void irlan_open_unicast_addr(struct irlan_cb *self)
-{
-	struct sk_buff *skb;
-	__u8 *frame;
-
-	IRDA_ASSERT(self != NULL, return;);
-	IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
-
-	skb = alloc_skb(IRLAN_MAX_HEADER + IRLAN_CMD_HEADER +
-			IRLAN_BYTE_PARAMETER_LEN("DATA_CHAN") +
-			IRLAN_STRING_PARAMETER_LEN("FILTER_TYPE", "DIRECTED") +
-			IRLAN_STRING_PARAMETER_LEN("FILTER_MODE", "FILTER"),
-			GFP_ATOMIC);
-	if (!skb)
-		return;
-
-	/* Reserve space for TTP, LMP, and LAP header */
-	skb_reserve(skb, self->max_header_size);
-	skb_put(skb, 2);
-
-	frame = skb->data;
-
-	frame[0] = CMD_FILTER_OPERATION;
-	frame[1] = 0x03;                 /* Three parameters */
-	irlan_insert_byte_param(skb, "DATA_CHAN" , self->dtsap_sel_data);
-	irlan_insert_string_param(skb, "FILTER_TYPE", "DIRECTED");
-	irlan_insert_string_param(skb, "FILTER_MODE", "FILTER");
-
-	irlan_ctrl_data_request(self, skb);
-}
-
-/*
- * Function irlan_set_broadcast_filter (self, status)
- *
- *    Make IrLAN provider accept ethernet frames addressed to the broadcast
- *    address. Be careful with the use of this one, since there may be a lot
- *    of broadcast traffic out there. We can still function without this
- *    one but then _we_ have to initiate all communication with other
- *    hosts, since ARP request for this host will not be answered.
- */
-void irlan_set_broadcast_filter(struct irlan_cb *self, int status)
-{
-	struct sk_buff *skb;
-	__u8 *frame;
-
-	IRDA_ASSERT(self != NULL, return;);
-	IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
-
-	skb = alloc_skb(IRLAN_MAX_HEADER + IRLAN_CMD_HEADER +
-			IRLAN_BYTE_PARAMETER_LEN("DATA_CHAN") +
-			IRLAN_STRING_PARAMETER_LEN("FILTER_TYPE", "BROADCAST") +
-			/* We may waste one byte here...*/
-			IRLAN_STRING_PARAMETER_LEN("FILTER_MODE", "FILTER"),
-			GFP_ATOMIC);
-	if (!skb)
-		return;
-
-	/* Reserve space for TTP, LMP, and LAP header */
-	skb_reserve(skb, self->client.max_header_size);
-	skb_put(skb, 2);
-
-	frame = skb->data;
-
-	frame[0] = CMD_FILTER_OPERATION;
-	frame[1] = 0x03;                 /* Three parameters */
-	irlan_insert_byte_param(skb, "DATA_CHAN", self->dtsap_sel_data);
-	irlan_insert_string_param(skb, "FILTER_TYPE", "BROADCAST");
-	if (status)
-		irlan_insert_string_param(skb, "FILTER_MODE", "FILTER");
-	else
-		irlan_insert_string_param(skb, "FILTER_MODE", "NONE");
-
-	irlan_ctrl_data_request(self, skb);
-}
-
-/*
- * Function irlan_set_multicast_filter (self, status)
- *
- *    Make IrLAN provider accept ethernet frames addressed to the multicast
- *    address.
- *
- */
-void irlan_set_multicast_filter(struct irlan_cb *self, int status)
-{
-	struct sk_buff *skb;
-	__u8 *frame;
-
-	IRDA_ASSERT(self != NULL, return;);
-	IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
-
-	skb = alloc_skb(IRLAN_MAX_HEADER + IRLAN_CMD_HEADER +
-			IRLAN_BYTE_PARAMETER_LEN("DATA_CHAN") +
-			IRLAN_STRING_PARAMETER_LEN("FILTER_TYPE", "MULTICAST") +
-			/* We may waste one byte here...*/
-			IRLAN_STRING_PARAMETER_LEN("FILTER_MODE", "NONE"),
-			GFP_ATOMIC);
-	if (!skb)
-		return;
-
-	/* Reserve space for TTP, LMP, and LAP header */
-	skb_reserve(skb, self->client.max_header_size);
-	skb_put(skb, 2);
-
-	frame = skb->data;
-
-	frame[0] = CMD_FILTER_OPERATION;
-	frame[1] = 0x03;                 /* Three parameters */
-	irlan_insert_byte_param(skb, "DATA_CHAN", self->dtsap_sel_data);
-	irlan_insert_string_param(skb, "FILTER_TYPE", "MULTICAST");
-	if (status)
-		irlan_insert_string_param(skb, "FILTER_MODE", "ALL");
-	else
-		irlan_insert_string_param(skb, "FILTER_MODE", "NONE");
-
-	irlan_ctrl_data_request(self, skb);
-}
-
-/*
- * Function irlan_get_unicast_addr (self)
- *
- *    Retrieves the unicast address from the IrLAN provider. This address
- *    will be inserted into the devices structure, so the ethernet layer
- *    can construct its packets.
- *
- */
-static void irlan_get_unicast_addr(struct irlan_cb *self)
-{
-	struct sk_buff *skb;
-	__u8 *frame;
-
-	IRDA_ASSERT(self != NULL, return;);
-	IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
-
-	skb = alloc_skb(IRLAN_MAX_HEADER + IRLAN_CMD_HEADER +
-			IRLAN_BYTE_PARAMETER_LEN("DATA_CHAN") +
-			IRLAN_STRING_PARAMETER_LEN("FILTER_TYPE", "DIRECTED") +
-			IRLAN_STRING_PARAMETER_LEN("FILTER_OPERATION",
-						   "DYNAMIC"),
-			GFP_ATOMIC);
-	if (!skb)
-		return;
-
-	/* Reserve space for TTP, LMP, and LAP header */
-	skb_reserve(skb, self->client.max_header_size);
-	skb_put(skb, 2);
-
-	frame = skb->data;
-
-	frame[0] = CMD_FILTER_OPERATION;
-	frame[1] = 0x03;                 /* Three parameters */
-	irlan_insert_byte_param(skb, "DATA_CHAN", self->dtsap_sel_data);
-	irlan_insert_string_param(skb, "FILTER_TYPE", "DIRECTED");
-	irlan_insert_string_param(skb, "FILTER_OPERATION", "DYNAMIC");
-
-	irlan_ctrl_data_request(self, skb);
-}
-
-/*
- * Function irlan_get_media_char (self)
- *
- *
- *
- */
-void irlan_get_media_char(struct irlan_cb *self)
-{
-	struct sk_buff *skb;
-	__u8 *frame;
-
-	IRDA_ASSERT(self != NULL, return;);
-	IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
-
-	skb = alloc_skb(IRLAN_MAX_HEADER + IRLAN_CMD_HEADER +
-			IRLAN_STRING_PARAMETER_LEN("MEDIA", "802.3"),
-			GFP_ATOMIC);
-
-	if (!skb)
-		return;
-
-	/* Reserve space for TTP, LMP, and LAP header */
-	skb_reserve(skb, self->client.max_header_size);
-	skb_put(skb, 2);
-
-	frame = skb->data;
-
-	/* Build frame */
-	frame[0] = CMD_GET_MEDIA_CHAR;
-	frame[1] = 0x01; /* One parameter */
-
-	irlan_insert_string_param(skb, "MEDIA", "802.3");
-	irlan_ctrl_data_request(self, skb);
-}
-
-/*
- * Function insert_byte_param (skb, param, value)
- *
- *    Insert byte parameter into frame
- *
- */
-int irlan_insert_byte_param(struct sk_buff *skb, char *param, __u8 value)
-{
-	return __irlan_insert_param(skb, param, IRLAN_BYTE, value, 0, NULL, 0);
-}
-
-int irlan_insert_short_param(struct sk_buff *skb, char *param, __u16 value)
-{
-	return __irlan_insert_param(skb, param, IRLAN_SHORT, 0, value, NULL, 0);
-}
-
-/*
- * Function insert_string (skb, param, value)
- *
- *    Insert string parameter into frame
- *
- */
-int irlan_insert_string_param(struct sk_buff *skb, char *param, char *string)
-{
-	int string_len = strlen(string);
-
-	return __irlan_insert_param(skb, param, IRLAN_ARRAY, 0, 0, string,
-				    string_len);
-}
-
-/*
- * Function insert_array_param(skb, param, value, len_value)
- *
- *    Insert array parameter into frame
- *
- */
-int irlan_insert_array_param(struct sk_buff *skb, char *name, __u8 *array,
-			     __u16 array_len)
-{
-	return __irlan_insert_param(skb, name, IRLAN_ARRAY, 0, 0, array,
-				    array_len);
-}
-
-/*
- * Function insert_param (skb, param, value, byte)
- *
- *    Insert parameter at end of buffer, structure of a parameter is:
- *
- *    -----------------------------------------------------------------------
- *    | Name Length[1] | Param Name[1..255] | Val Length[2] | Value[0..1016]|
- *    -----------------------------------------------------------------------
- */
-static int __irlan_insert_param(struct sk_buff *skb, char *param, int type,
-				__u8 value_byte, __u16 value_short,
-				__u8 *value_array, __u16 value_len)
-{
-	__u8 *frame;
-	__u8 param_len;
-	__le16 tmp_le; /* Temporary value in little endian format */
-	int n=0;
-
-	if (skb == NULL) {
-		pr_debug("%s(), Got NULL skb\n", __func__);
-		return 0;
-	}
-
-	param_len = strlen(param);
-	switch (type) {
-	case IRLAN_BYTE:
-		value_len = 1;
-		break;
-	case IRLAN_SHORT:
-		value_len = 2;
-		break;
-	case IRLAN_ARRAY:
-		IRDA_ASSERT(value_array != NULL, return 0;);
-		IRDA_ASSERT(value_len > 0, return 0;);
-		break;
-	default:
-		pr_debug("%s(), Unknown parameter type!\n", __func__);
-		return 0;
-	}
-
-	/* Insert at end of sk-buffer */
-	frame = skb_tail_pointer(skb);
-
-	/* Make space for data */
-	if (skb_tailroom(skb) < (param_len+value_len+3)) {
-		pr_debug("%s(), No more space at end of skb\n", __func__);
-		return 0;
-	}
-	skb_put(skb, param_len+value_len+3);
-
-	/* Insert parameter length */
-	frame[n++] = param_len;
-
-	/* Insert parameter */
-	memcpy(frame+n, param, param_len); n += param_len;
-
-	/* Insert value length (2 byte little endian format, LSB first) */
-	tmp_le = cpu_to_le16(value_len);
-	memcpy(frame+n, &tmp_le, 2); n += 2; /* To avoid alignment problems */
-
-	/* Insert value */
-	switch (type) {
-	case IRLAN_BYTE:
-		frame[n++] = value_byte;
-		break;
-	case IRLAN_SHORT:
-		tmp_le = cpu_to_le16(value_short);
-		memcpy(frame+n, &tmp_le, 2); n += 2;
-		break;
-	case IRLAN_ARRAY:
-		memcpy(frame+n, value_array, value_len); n+=value_len;
-		break;
-	default:
-		break;
-	}
-	IRDA_ASSERT(n == (param_len+value_len+3), return 0;);
-
-	return param_len+value_len+3;
-}
-
-/*
- * Function irlan_extract_param (buf, name, value, len)
- *
- *    Extracts a single parameter name/value pair from buffer and updates
- *    the buffer pointer to point to the next name/value pair.
- */
-int irlan_extract_param(__u8 *buf, char *name, char *value, __u16 *len)
-{
-	__u8 name_len;
-	__u16 val_len;
-	int n=0;
-
-	/* get length of parameter name (1 byte) */
-	name_len = buf[n++];
-
-	if (name_len > 254) {
-		pr_debug("%s(), name_len > 254\n", __func__);
-		return -RSP_INVALID_COMMAND_FORMAT;
-	}
-
-	/* get parameter name */
-	memcpy(name, buf+n, name_len);
-	name[name_len] = '\0';
-	n+=name_len;
-
-	/*
-	 *  Get length of parameter value (2 bytes in little endian
-	 *  format)
-	 */
-	memcpy(&val_len, buf+n, 2); /* To avoid alignment problems */
-	le16_to_cpus(&val_len); n+=2;
-
-	if (val_len >= 1016) {
-		pr_debug("%s(), parameter length to long\n", __func__);
-		return -RSP_INVALID_COMMAND_FORMAT;
-	}
-	*len = val_len;
-
-	/* get parameter value */
-	memcpy(value, buf+n, val_len);
-	value[val_len] = '\0';
-	n+=val_len;
-
-	pr_debug("Parameter: %s ", name);
-	pr_debug("Value: %s\n", value);
-
-	return n;
-}
-
-#ifdef CONFIG_PROC_FS
-
-/*
- * Start of reading /proc entries.
- * Return entry at pos,
- *	or start_token to indicate print header line
- *	or NULL if end of file
- */
-static void *irlan_seq_start(struct seq_file *seq, loff_t *pos)
-{
-	rcu_read_lock();
-	return seq_list_start_head(&irlans, *pos);
-}
-
-/* Return entry after v, and increment pos */
-static void *irlan_seq_next(struct seq_file *seq, void *v, loff_t *pos)
-{
-	return seq_list_next(v, &irlans, pos);
-}
-
-/* End of reading /proc file */
-static void irlan_seq_stop(struct seq_file *seq, void *v)
-{
-	rcu_read_unlock();
-}
-
-
-/*
- * Show one entry in /proc file.
- */
-static int irlan_seq_show(struct seq_file *seq, void *v)
-{
-	if (v == &irlans)
-		seq_puts(seq, "IrLAN instances:\n");
-	else {
-		struct irlan_cb *self = list_entry(v, struct irlan_cb, dev_list);
-
-		IRDA_ASSERT(self != NULL, return -1;);
-		IRDA_ASSERT(self->magic == IRLAN_MAGIC, return -1;);
-
-		seq_printf(seq,"ifname: %s,\n",
-			       self->dev->name);
-		seq_printf(seq,"client state: %s, ",
-			       irlan_state[ self->client.state]);
-		seq_printf(seq,"provider state: %s,\n",
-			       irlan_state[ self->provider.state]);
-		seq_printf(seq,"saddr: %#08x, ",
-			       self->saddr);
-		seq_printf(seq,"daddr: %#08x\n",
-			       self->daddr);
-		seq_printf(seq,"version: %d.%d,\n",
-			       self->version[1], self->version[0]);
-		seq_printf(seq,"access type: %s\n",
-			       irlan_access[self->client.access_type]);
-		seq_printf(seq,"media: %s\n",
-			       irlan_media[self->media]);
-
-		seq_printf(seq,"local filter:\n");
-		seq_printf(seq,"remote filter: ");
-		irlan_print_filter(seq, self->client.filter_type);
-		seq_printf(seq,"tx busy: %s\n",
-			       netif_queue_stopped(self->dev) ? "TRUE" : "FALSE");
-
-		seq_putc(seq,'\n');
-	}
-	return 0;
-}
-
-static const struct seq_operations irlan_seq_ops = {
-	.start = irlan_seq_start,
-	.next  = irlan_seq_next,
-	.stop  = irlan_seq_stop,
-	.show  = irlan_seq_show,
-};
-
-static int irlan_seq_open(struct inode *inode, struct file *file)
-{
-	return seq_open(file, &irlan_seq_ops);
-}
-#endif
-
-MODULE_AUTHOR("Dag Brattli <dagb@cs.uit.no>");
-MODULE_DESCRIPTION("The Linux IrDA LAN protocol");
-MODULE_LICENSE("GPL");
-
-module_param(eth, bool, 0);
-MODULE_PARM_DESC(eth, "Name devices ethX (0) or irlanX (1)");
-module_param(access, int, 0);
-MODULE_PARM_DESC(access, "Access type DIRECT=1, PEER=2, HOSTED=3");
-
-module_init(irlan_init);
-module_exit(irlan_cleanup);
-
diff --git a/net/irda/irlan/irlan_eth.c b/net/irda/irlan/irlan_eth.c
deleted file mode 100644
index 3be852808a9d..000000000000
--- a/net/irda/irlan/irlan_eth.c
+++ /dev/null
@@ -1,340 +0,0 @@
-/*********************************************************************
- *
- * Filename:      irlan_eth.c
- * Version:
- * Description:
- * Status:        Experimental.
- * Author:        Dag Brattli <dagb@cs.uit.no>
- * Created at:    Thu Oct 15 08:37:58 1998
- * Modified at:   Tue Mar 21 09:06:41 2000
- * Modified by:   Dag Brattli <dagb@cs.uit.no>
- * Sources:       skeleton.c by Donald Becker <becker@CESDIS.gsfc.nasa.gov>
- *                slip.c by Laurence Culhane,   <loz@holmes.demon.co.uk>
- *                          Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
- *
- *     Copyright (c) 1998-2000 Dag Brattli, All Rights Reserved.
- *
- *     This program is free software; you can redistribute it and/or
- *     modify it under the terms of the GNU General Public License as
- *     published by the Free Software Foundation; either version 2 of
- *     the License, or (at your option) any later version.
- *
- *     Neither Dag Brattli nor University of Tromsø admit liability nor
- *     provide warranty for any of this software. This material is
- *     provided "AS-IS" and at no charge.
- *
- ********************************************************************/
-
-#include <linux/netdevice.h>
-#include <linux/etherdevice.h>
-#include <linux/inetdevice.h>
-#include <linux/if_arp.h>
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <net/arp.h>
-
-#include <net/irda/irda.h>
-#include <net/irda/irmod.h>
-#include <net/irda/irlan_common.h>
-#include <net/irda/irlan_client.h>
-#include <net/irda/irlan_event.h>
-#include <net/irda/irlan_eth.h>
-
-static int  irlan_eth_open(struct net_device *dev);
-static int  irlan_eth_close(struct net_device *dev);
-static netdev_tx_t  irlan_eth_xmit(struct sk_buff *skb,
-					 struct net_device *dev);
-static void irlan_eth_set_multicast_list(struct net_device *dev);
-
-static const struct net_device_ops irlan_eth_netdev_ops = {
-	.ndo_open		= irlan_eth_open,
-	.ndo_stop		= irlan_eth_close,
-	.ndo_start_xmit		= irlan_eth_xmit,
-	.ndo_set_rx_mode	= irlan_eth_set_multicast_list,
-	.ndo_validate_addr	= eth_validate_addr,
-};
-
-/*
- * Function irlan_eth_setup (dev)
- *
- *    The network device initialization function.
- *
- */
-static void irlan_eth_setup(struct net_device *dev)
-{
-	ether_setup(dev);
-
-	dev->netdev_ops		= &irlan_eth_netdev_ops;
-	dev->needs_free_netdev	= true;
-	dev->min_mtu		= 0;
-	dev->max_mtu		= ETH_MAX_MTU;
-
-	/*
-	 * Lets do all queueing in IrTTP instead of this device driver.
-	 * Queueing here as well can introduce some strange latency
-	 * problems, which we will avoid by setting the queue size to 0.
-	 */
-	/*
-	 * The bugs in IrTTP and IrLAN that created this latency issue
-	 * have now been fixed, and we can propagate flow control properly
-	 * to the network layer. However, this requires a minimal queue of
-	 * packets for the device.
-	 * Without flow control, the Tx Queue is 14 (ttp) + 0 (dev) = 14
-	 * With flow control, the Tx Queue is 7 (ttp) + 4 (dev) = 11
-	 * See irlan_eth_flow_indication()...
-	 * Note : this number was randomly selected and would need to
-	 * be adjusted.
-	 * Jean II */
-	dev->tx_queue_len = 4;
-}
-
-/*
- * Function alloc_irlandev
- *
- *    Allocate network device and control block
- *
- */
-struct net_device *alloc_irlandev(const char *name)
-{
-	return alloc_netdev(sizeof(struct irlan_cb), name, NET_NAME_UNKNOWN,
-			    irlan_eth_setup);
-}
-
-/*
- * Function irlan_eth_open (dev)
- *
- *    Network device has been opened by user
- *
- */
-static int irlan_eth_open(struct net_device *dev)
-{
-	struct irlan_cb *self = netdev_priv(dev);
-
-	/* Ready to play! */
-	netif_stop_queue(dev); /* Wait until data link is ready */
-
-	/* We are now open, so time to do some work */
-	self->disconnect_reason = 0;
-	irlan_client_wakeup(self, self->saddr, self->daddr);
-
-	/* Make sure we have a hardware address before we return,
-	   so DHCP clients gets happy */
-	return wait_event_interruptible(self->open_wait,
-					!self->tsap_data->connected);
-}
-
-/*
- * Function irlan_eth_close (dev)
- *
- *    Stop the ether network device, his function will usually be called by
- *    ifconfig down. We should now disconnect the link, We start the
- *    close timer, so that the instance will be removed if we are unable
- *    to discover the remote device after the disconnect.
- */
-static int irlan_eth_close(struct net_device *dev)
-{
-	struct irlan_cb *self = netdev_priv(dev);
-
-	/* Stop device */
-	netif_stop_queue(dev);
-
-	irlan_close_data_channel(self);
-	irlan_close_tsaps(self);
-
-	irlan_do_client_event(self, IRLAN_LMP_DISCONNECT, NULL);
-	irlan_do_provider_event(self, IRLAN_LMP_DISCONNECT, NULL);
-
-	/* Remove frames queued on the control channel */
-	skb_queue_purge(&self->client.txq);
-
-	self->client.tx_busy = 0;
-
-	return 0;
-}
-
-/*
- * Function irlan_eth_tx (skb)
- *
- *    Transmits ethernet frames over IrDA link.
- *
- */
-static netdev_tx_t irlan_eth_xmit(struct sk_buff *skb,
-					struct net_device *dev)
-{
-	struct irlan_cb *self = netdev_priv(dev);
-	int ret;
-	unsigned int len;
-
-	/* skb headroom large enough to contain all IrDA-headers? */
-	if ((skb_headroom(skb) < self->max_header_size) || (skb_shared(skb))) {
-		struct sk_buff *new_skb =
-			skb_realloc_headroom(skb, self->max_header_size);
-
-		/*  We have to free the original skb anyway */
-		dev_kfree_skb(skb);
-
-		/* Did the realloc succeed? */
-		if (new_skb == NULL)
-			return NETDEV_TX_OK;
-
-		/* Use the new skb instead */
-		skb = new_skb;
-	}
-
-	netif_trans_update(dev);
-
-	len = skb->len;
-	/* Now queue the packet in the transport layer */
-	if (self->use_udata)
-		ret = irttp_udata_request(self->tsap_data, skb);
-	else
-		ret = irttp_data_request(self->tsap_data, skb);
-
-	if (ret < 0) {
-		/*
-		 * IrTTPs tx queue is full, so we just have to
-		 * drop the frame! You might think that we should
-		 * just return -1 and don't deallocate the frame,
-		 * but that is dangerous since it's possible that
-		 * we have replaced the original skb with a new
-		 * one with larger headroom, and that would really
-		 * confuse do_dev_queue_xmit() in dev.c! I have
-		 * tried :-) DB
-		 */
-		/* irttp_data_request already free the packet */
-		dev->stats.tx_dropped++;
-	} else {
-		dev->stats.tx_packets++;
-		dev->stats.tx_bytes += len;
-	}
-
-	return NETDEV_TX_OK;
-}
-
-/*
- * Function irlan_eth_receive (handle, skb)
- *
- *    This function gets the data that is received on the data channel
- *
- */
-int irlan_eth_receive(void *instance, void *sap, struct sk_buff *skb)
-{
-	struct irlan_cb *self = instance;
-	struct net_device *dev = self->dev;
-
-	if (skb == NULL) {
-		dev->stats.rx_dropped++;
-		return 0;
-	}
-	if (skb->len < ETH_HLEN) {
-		pr_debug("%s() : IrLAN frame too short (%d)\n",
-			 __func__, skb->len);
-		dev->stats.rx_dropped++;
-		dev_kfree_skb(skb);
-		return 0;
-	}
-
-	/*
-	 * Adopt this frame! Important to set all these fields since they
-	 * might have been previously set by the low level IrDA network
-	 * device driver
-	 */
-	skb->protocol = eth_type_trans(skb, dev); /* Remove eth header */
-
-	dev->stats.rx_packets++;
-	dev->stats.rx_bytes += skb->len;
-
-	netif_rx(skb);   /* Eat it! */
-
-	return 0;
-}
-
-/*
- * Function irlan_eth_flow (status)
- *
- *    Do flow control between IP/Ethernet and IrLAN/IrTTP. This is done by
- *    controlling the queue stop/start.
- *
- * The IrDA link layer has the advantage to have flow control, and
- * IrTTP now properly handles that. Flow controlling the higher layers
- * prevent us to drop Tx packets in here (up to 15% for a TCP socket,
- * more for UDP socket).
- * Also, this allow us to reduce the overall transmit queue, which means
- * less latency in case of mixed traffic.
- * Jean II
- */
-void irlan_eth_flow_indication(void *instance, void *sap, LOCAL_FLOW flow)
-{
-	struct irlan_cb *self;
-	struct net_device *dev;
-
-	self = instance;
-
-	IRDA_ASSERT(self != NULL, return;);
-	IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
-
-	dev = self->dev;
-
-	IRDA_ASSERT(dev != NULL, return;);
-
-	pr_debug("%s() : flow %s ; running %d\n", __func__,
-		 flow == FLOW_STOP ? "FLOW_STOP" : "FLOW_START",
-		 netif_running(dev));
-
-	switch (flow) {
-	case FLOW_STOP:
-		/* IrTTP is full, stop higher layers */
-		netif_stop_queue(dev);
-		break;
-	case FLOW_START:
-	default:
-		/* Tell upper layers that its time to transmit frames again */
-		/* Schedule network layer */
-		netif_wake_queue(dev);
-		break;
-	}
-}
-
-/*
- * Function set_multicast_list (dev)
- *
- *    Configure the filtering of the device
- *
- */
-#define HW_MAX_ADDRS 4 /* Must query to get it! */
-static void irlan_eth_set_multicast_list(struct net_device *dev)
-{
-	struct irlan_cb *self = netdev_priv(dev);
-
-	/* Check if data channel has been connected yet */
-	if (self->client.state != IRLAN_DATA) {
-		pr_debug("%s(), delaying!\n", __func__);
-		return;
-	}
-
-	if (dev->flags & IFF_PROMISC) {
-		/* Enable promiscuous mode */
-		net_warn_ratelimited("Promiscuous mode not implemented by IrLAN!\n");
-	} else if ((dev->flags & IFF_ALLMULTI) ||
-		 netdev_mc_count(dev) > HW_MAX_ADDRS) {
-		/* Disable promiscuous mode, use normal mode. */
-		pr_debug("%s(), Setting multicast filter\n", __func__);
-		/* hardware_set_filter(NULL); */
-
-		irlan_set_multicast_filter(self, TRUE);
-	} else if (!netdev_mc_empty(dev)) {
-		pr_debug("%s(), Setting multicast filter\n", __func__);
-		/* Walk the address list, and load the filter */
-		/* hardware_set_filter(dev->mc_list); */
-
-		irlan_set_multicast_filter(self, TRUE);
-	} else {
-		pr_debug("%s(), Clearing multicast filter\n", __func__);
-		irlan_set_multicast_filter(self, FALSE);
-	}
-
-	if (dev->flags & IFF_BROADCAST)
-		irlan_set_broadcast_filter(self, TRUE);
-	else
-		irlan_set_broadcast_filter(self, FALSE);
-}
diff --git a/net/irda/irlan/irlan_event.c b/net/irda/irlan/irlan_event.c
deleted file mode 100644
index 9a1cc11c16f6..000000000000
--- a/net/irda/irlan/irlan_event.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*********************************************************************
- *
- * Filename:      irlan_event.c
- * Version:
- * Description:
- * Status:        Experimental.
- * Author:        Dag Brattli <dagb@cs.uit.no>
- * Created at:    Tue Oct 20 09:10:16 1998
- * Modified at:   Sat Oct 30 12:59:01 1999
- * Modified by:   Dag Brattli <dagb@cs.uit.no>
- *
- *     Copyright (c) 1998-1999 Dag Brattli, All Rights Reserved.
- *
- *     This program is free software; you can redistribute it and/or
- *     modify it under the terms of the GNU General Public License as
- *     published by the Free Software Foundation; either version 2 of
- *     the License, or (at your option) any later version.
- *
- *     Neither Dag Brattli nor University of Tromsø admit liability nor
- *     provide warranty for any of this software. This material is
- *     provided "AS-IS" and at no charge.
- *
- ********************************************************************/
-
-#include <net/irda/irlan_event.h>
-
-const char * const irlan_state[] = {
-	"IRLAN_IDLE",
-	"IRLAN_QUERY",
-	"IRLAN_CONN",
-	"IRLAN_INFO",
-	"IRLAN_MEDIA",
-	"IRLAN_OPEN",
-	"IRLAN_WAIT",
-	"IRLAN_ARB",
-	"IRLAN_DATA",
-	"IRLAN_CLOSE",
-	"IRLAN_SYNC",
-};
-
-void irlan_next_client_state(struct irlan_cb *self, IRLAN_STATE state)
-{
-	pr_debug("%s(), %s\n", __func__ , irlan_state[state]);
-
-	IRDA_ASSERT(self != NULL, return;);
-	IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
-
-	self->client.state = state;
-}
-
-void irlan_next_provider_state(struct irlan_cb *self, IRLAN_STATE state)
-{
-	pr_debug("%s(), %s\n", __func__ , irlan_state[state]);
-
-	IRDA_ASSERT(self != NULL, return;);
-	IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
-
-	self->provider.state = state;
-}
-
diff --git a/net/irda/irlan/irlan_filter.c b/net/irda/irlan/irlan_filter.c
deleted file mode 100644
index e755e90b2f26..000000000000
--- a/net/irda/irlan/irlan_filter.c
+++ /dev/null
@@ -1,240 +0,0 @@
-/*********************************************************************
- *
- * Filename:      irlan_filter.c
- * Version:
- * Description:
- * Status:        Experimental.
- * Author:        Dag Brattli <dagb@cs.uit.no>
- * Created at:    Fri Jan 29 11:16:38 1999
- * Modified at:   Sat Oct 30 12:58:45 1999
- * Modified by:   Dag Brattli <dagb@cs.uit.no>
- *
- *     Copyright (c) 1998-1999 Dag Brattli, All Rights Reserved.
- *
- *     This program is free software; you can redistribute it and/or
- *     modify it under the terms of the GNU General Public License as
- *     published by the Free Software Foundation; either version 2 of
- *     the License, or (at your option) any later version.
- *
- *     Neither Dag Brattli nor University of Tromsø admit liability nor
- *     provide warranty for any of this software. This material is
- *     provided "AS-IS" and at no charge.
- *
- ********************************************************************/
-
-#include <linux/skbuff.h>
-#include <linux/random.h>
-#include <linux/seq_file.h>
-
-#include <net/irda/irlan_common.h>
-#include <net/irda/irlan_filter.h>
-
-/*
- * Function irlan_filter_request (self, skb)
- *
- *    Handle filter request from client peer device
- *
- */
-void irlan_filter_request(struct irlan_cb *self, struct sk_buff *skb)
-{
-	IRDA_ASSERT(self != NULL, return;);
-	IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
-
-	if ((self->provider.filter_type == IRLAN_DIRECTED) &&
-	    (self->provider.filter_operation == DYNAMIC))
-	{
-		pr_debug("Giving peer a dynamic Ethernet address\n");
-		self->provider.mac_address[0] = 0x40;
-		self->provider.mac_address[1] = 0x00;
-		self->provider.mac_address[2] = 0x00;
-		self->provider.mac_address[3] = 0x00;
-
-		/* Use arbitration value to generate MAC address */
-		if (self->provider.access_type == ACCESS_PEER) {
-			self->provider.mac_address[4] =
-				self->provider.send_arb_val & 0xff;
-			self->provider.mac_address[5] =
-				(self->provider.send_arb_val >> 8) & 0xff;
-		} else {
-			/* Just generate something for now */
-			get_random_bytes(self->provider.mac_address+4, 1);
-			get_random_bytes(self->provider.mac_address+5, 1);
-		}
-
-		skb->data[0] = 0x00; /* Success */
-		skb->data[1] = 0x03;
-		irlan_insert_string_param(skb, "FILTER_MODE", "NONE");
-		irlan_insert_short_param(skb, "MAX_ENTRY", 0x0001);
-		irlan_insert_array_param(skb, "FILTER_ENTRY",
-					 self->provider.mac_address, 6);
-		return;
-	}
-
-	if ((self->provider.filter_type == IRLAN_DIRECTED) &&
-	    (self->provider.filter_mode == FILTER))
-	{
-		pr_debug("Directed filter on\n");
-		skb->data[0] = 0x00; /* Success */
-		skb->data[1] = 0x00;
-		return;
-	}
-	if ((self->provider.filter_type == IRLAN_DIRECTED) &&
-	    (self->provider.filter_mode == NONE))
-	{
-		pr_debug("Directed filter off\n");
-		skb->data[0] = 0x00; /* Success */
-		skb->data[1] = 0x00;
-		return;
-	}
-
-	if ((self->provider.filter_type == IRLAN_BROADCAST) &&
-	    (self->provider.filter_mode == FILTER))
-	{
-		pr_debug("Broadcast filter on\n");
-		skb->data[0] = 0x00; /* Success */
-		skb->data[1] = 0x00;
-		return;
-	}
-	if ((self->provider.filter_type == IRLAN_BROADCAST) &&
-	    (self->provider.filter_mode == NONE))
-	{
-		pr_debug("Broadcast filter off\n");
-		skb->data[0] = 0x00; /* Success */
-		skb->data[1] = 0x00;
-		return;
-	}
-	if ((self->provider.filter_type == IRLAN_MULTICAST) &&
-	    (self->provider.filter_mode == FILTER))
-	{
-		pr_debug("Multicast filter on\n");
-		skb->data[0] = 0x00; /* Success */
-		skb->data[1] = 0x00;
-		return;
-	}
-	if ((self->provider.filter_type == IRLAN_MULTICAST) &&
-	    (self->provider.filter_mode == NONE))
-	{
-		pr_debug("Multicast filter off\n");
-		skb->data[0] = 0x00; /* Success */
-		skb->data[1] = 0x00;
-		return;
-	}
-	if ((self->provider.filter_type == IRLAN_MULTICAST) &&
-	    (self->provider.filter_operation == GET))
-	{
-		pr_debug("Multicast filter get\n");
-		skb->data[0] = 0x00; /* Success? */
-		skb->data[1] = 0x02;
-		irlan_insert_string_param(skb, "FILTER_MODE", "NONE");
-		irlan_insert_short_param(skb, "MAX_ENTRY", 16);
-		return;
-	}
-	skb->data[0] = 0x00; /* Command not supported */
-	skb->data[1] = 0x00;
-
-	pr_debug("Not implemented!\n");
-}
-
-/*
- * Function check_request_param (self, param, value)
- *
- *    Check parameters in request from peer device
- *
- */
-void irlan_check_command_param(struct irlan_cb *self, char *param, char *value)
-{
-	IRDA_ASSERT(self != NULL, return;);
-	IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
-
-	pr_debug("%s, %s\n", param, value);
-
-	/*
-	 *  This is experimental!! DB.
-	 */
-	 if (strcmp(param, "MODE") == 0) {
-		self->use_udata = TRUE;
-		return;
-	}
-
-	/*
-	 *  FILTER_TYPE
-	 */
-	if (strcmp(param, "FILTER_TYPE") == 0) {
-		if (strcmp(value, "DIRECTED") == 0) {
-			self->provider.filter_type = IRLAN_DIRECTED;
-			return;
-		}
-		if (strcmp(value, "MULTICAST") == 0) {
-			self->provider.filter_type = IRLAN_MULTICAST;
-			return;
-		}
-		if (strcmp(value, "BROADCAST") == 0) {
-			self->provider.filter_type = IRLAN_BROADCAST;
-			return;
-		}
-	}
-	/*
-	 *  FILTER_MODE
-	 */
-	if (strcmp(param, "FILTER_MODE") == 0) {
-		if (strcmp(value, "ALL") == 0) {
-			self->provider.filter_mode = ALL;
-			return;
-		}
-		if (strcmp(value, "FILTER") == 0) {
-			self->provider.filter_mode = FILTER;
-			return;
-		}
-		if (strcmp(value, "NONE") == 0) {
-			self->provider.filter_mode = FILTER;
-			return;
-		}
-	}
-	/*
-	 *  FILTER_OPERATION
-	 */
-	if (strcmp(param, "FILTER_OPERATION") == 0) {
-		if (strcmp(value, "DYNAMIC") == 0) {
-			self->provider.filter_operation = DYNAMIC;
-			return;
-		}
-		if (strcmp(value, "GET") == 0) {
-			self->provider.filter_operation = GET;
-			return;
-		}
-	}
-}
-
-/*
- * Function irlan_print_filter (filter_type, buf)
- *
- *    Print status of filter. Used by /proc file system
- *
- */
-#ifdef CONFIG_PROC_FS
-#define MASK2STR(m,s)	{ .mask = m, .str = s }
-
-void irlan_print_filter(struct seq_file *seq, int filter_type)
-{
-	static struct {
-		int mask;
-		const char *str;
-	} filter_mask2str[] = {
-		MASK2STR(IRLAN_DIRECTED,	"DIRECTED"),
-		MASK2STR(IRLAN_FUNCTIONAL,	"FUNCTIONAL"),
-		MASK2STR(IRLAN_GROUP,		"GROUP"),
-		MASK2STR(IRLAN_MAC_FRAME,	"MAC_FRAME"),
-		MASK2STR(IRLAN_MULTICAST,	"MULTICAST"),
-		MASK2STR(IRLAN_BROADCAST,	"BROADCAST"),
-		MASK2STR(IRLAN_IPX_SOCKET,	"IPX_SOCKET"),
-		MASK2STR(0,			NULL)
-	}, *p;
-
-	for (p = filter_mask2str; p->str; p++) {
-		if (filter_type & p->mask)
-			seq_printf(seq, "%s ", p->str);
-	}
-	seq_putc(seq, '\n');
-}
-#undef MASK2STR
-#endif
diff --git a/net/irda/irlan/irlan_provider.c b/net/irda/irlan/irlan_provider.c
deleted file mode 100644
index 15c292cf2644..000000000000
--- a/net/irda/irlan/irlan_provider.c
+++ /dev/null
@@ -1,408 +0,0 @@
-/*********************************************************************
- *
- * Filename:      irlan_provider.c
- * Version:       0.9
- * Description:   IrDA LAN Access Protocol Implementation
- * Status:        Experimental.
- * Author:        Dag Brattli <dagb@cs.uit.no>
- * Created at:    Sun Aug 31 20:14:37 1997
- * Modified at:   Sat Oct 30 12:52:10 1999
- * Modified by:   Dag Brattli <dagb@cs.uit.no>
- * Sources:       skeleton.c by Donald Becker <becker@CESDIS.gsfc.nasa.gov>
- *                slip.c by Laurence Culhane,   <loz@holmes.demon.co.uk>
- *                          Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
- *
- *     Copyright (c) 1998-1999 Dag Brattli <dagb@cs.uit.no>,
- *     All Rights Reserved.
- *
- *     This program is free software; you can redistribute it and/or
- *     modify it under the terms of the GNU General Public License as
- *     published by the Free Software Foundation; either version 2 of
- *     the License, or (at your option) any later version.
- *
- *     Neither Dag Brattli nor University of Tromsø admit liability nor
- *     provide warranty for any of this software. This material is
- *     provided "AS-IS" and at no charge.
- *
- ********************************************************************/
-
-#include <linux/kernel.h>
-#include <linux/string.h>
-#include <linux/errno.h>
-#include <linux/netdevice.h>
-#include <linux/etherdevice.h>
-#include <linux/init.h>
-#include <linux/random.h>
-#include <linux/bitops.h>
-#include <linux/slab.h>
-
-#include <asm/byteorder.h>
-
-#include <net/irda/irda.h>
-#include <net/irda/irttp.h>
-#include <net/irda/irlmp.h>
-#include <net/irda/irias_object.h>
-#include <net/irda/iriap.h>
-#include <net/irda/timer.h>
-
-#include <net/irda/irlan_common.h>
-#include <net/irda/irlan_eth.h>
-#include <net/irda/irlan_event.h>
-#include <net/irda/irlan_provider.h>
-#include <net/irda/irlan_filter.h>
-#include <net/irda/irlan_client.h>
-
-static void irlan_provider_connect_indication(void *instance, void *sap,
-					      struct qos_info *qos,
-					      __u32 max_sdu_size,
-					      __u8 max_header_size,
-					      struct sk_buff *skb);
-
-/*
- * Function irlan_provider_control_data_indication (handle, skb)
- *
- *    This function gets the data that is received on the control channel
- *
- */
-static int irlan_provider_data_indication(void *instance, void *sap,
-					  struct sk_buff *skb)
-{
-	struct irlan_cb *self;
-	__u8 code;
-
-	self = instance;
-
-	IRDA_ASSERT(self != NULL, return -1;);
-	IRDA_ASSERT(self->magic == IRLAN_MAGIC, return -1;);
-
-	IRDA_ASSERT(skb != NULL, return -1;);
-
-	code = skb->data[0];
-	switch(code) {
-	case CMD_GET_PROVIDER_INFO:
-		pr_debug("Got GET_PROVIDER_INFO command!\n");
-		irlan_do_provider_event(self, IRLAN_GET_INFO_CMD, skb);
-		break;
-
-	case CMD_GET_MEDIA_CHAR:
-		pr_debug("Got GET_MEDIA_CHAR command!\n");
-		irlan_do_provider_event(self, IRLAN_GET_MEDIA_CMD, skb);
-		break;
-	case CMD_OPEN_DATA_CHANNEL:
-		pr_debug("Got OPEN_DATA_CHANNEL command!\n");
-		irlan_do_provider_event(self, IRLAN_OPEN_DATA_CMD, skb);
-		break;
-	case CMD_FILTER_OPERATION:
-		pr_debug("Got FILTER_OPERATION command!\n");
-		irlan_do_provider_event(self, IRLAN_FILTER_CONFIG_CMD, skb);
-		break;
-	case CMD_RECONNECT_DATA_CHAN:
-		pr_debug("%s(), Got RECONNECT_DATA_CHAN command\n", __func__);
-		pr_debug("%s(), NOT IMPLEMENTED\n", __func__);
-		break;
-	case CMD_CLOSE_DATA_CHAN:
-		pr_debug("Got CLOSE_DATA_CHAN command!\n");
-		pr_debug("%s(), NOT IMPLEMENTED\n", __func__);
-		break;
-	default:
-		pr_debug("%s(), Unknown command!\n", __func__);
-		break;
-	}
-	return 0;
-}
-
-/*
- * Function irlan_provider_connect_indication (handle, skb, priv)
- *
- *    Got connection from peer IrLAN client
- *
- */
-static void irlan_provider_connect_indication(void *instance, void *sap,
-					      struct qos_info *qos,
-					      __u32 max_sdu_size,
-					      __u8 max_header_size,
-					      struct sk_buff *skb)
-{
-	struct irlan_cb *self;
-	struct tsap_cb *tsap;
-
-	self = instance;
-	tsap = sap;
-
-	IRDA_ASSERT(self != NULL, return;);
-	IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
-
-	IRDA_ASSERT(tsap == self->provider.tsap_ctrl,return;);
-	IRDA_ASSERT(self->provider.state == IRLAN_IDLE, return;);
-
-	self->provider.max_sdu_size = max_sdu_size;
-	self->provider.max_header_size = max_header_size;
-
-	irlan_do_provider_event(self, IRLAN_CONNECT_INDICATION, NULL);
-
-	/*
-	 * If we are in peer mode, the client may not have got the discovery
-	 * indication it needs to make progress. If the client is still in
-	 * IDLE state, we must kick it.
-	 */
-	if ((self->provider.access_type == ACCESS_PEER) &&
-	    (self->client.state == IRLAN_IDLE))
-	{
-		irlan_client_wakeup(self, self->saddr, self->daddr);
-	}
-}
-
-/*
- * Function irlan_provider_connect_response (handle)
- *
- *    Accept incoming connection
- *
- */
-void irlan_provider_connect_response(struct irlan_cb *self,
-				     struct tsap_cb *tsap)
-{
-	IRDA_ASSERT(self != NULL, return;);
-	IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
-
-	/* Just accept */
-	irttp_connect_response(tsap, IRLAN_MTU, NULL);
-}
-
-static void irlan_provider_disconnect_indication(void *instance, void *sap,
-						 LM_REASON reason,
-						 struct sk_buff *userdata)
-{
-	struct irlan_cb *self;
-	struct tsap_cb *tsap;
-
-	pr_debug("%s(), reason=%d\n", __func__ , reason);
-
-	self = instance;
-	tsap = sap;
-
-	IRDA_ASSERT(self != NULL, return;);
-	IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
-	IRDA_ASSERT(tsap != NULL, return;);
-	IRDA_ASSERT(tsap->magic == TTP_TSAP_MAGIC, return;);
-
-	IRDA_ASSERT(tsap == self->provider.tsap_ctrl, return;);
-
-	irlan_do_provider_event(self, IRLAN_LMP_DISCONNECT, NULL);
-}
-
-/*
- * Function irlan_parse_open_data_cmd (self, skb)
- *
- *
- *
- */
-int irlan_parse_open_data_cmd(struct irlan_cb *self, struct sk_buff *skb)
-{
-	int ret;
-
-	ret = irlan_provider_parse_command(self, CMD_OPEN_DATA_CHANNEL, skb);
-
-	/* Open data channel */
-	irlan_open_data_tsap(self);
-
-	return ret;
-}
-
-/*
- * Function parse_command (skb)
- *
- *    Extract all parameters from received buffer, then feed them to
- *    check_params for parsing
- *
- */
-int irlan_provider_parse_command(struct irlan_cb *self, int cmd,
-				 struct sk_buff *skb)
-{
-	__u8 *frame;
-	__u8 *ptr;
-	int count;
-	__u16 val_len;
-	int i;
-	char *name;
-	char *value;
-	int ret = RSP_SUCCESS;
-
-	IRDA_ASSERT(skb != NULL, return -RSP_PROTOCOL_ERROR;);
-
-	pr_debug("%s(), skb->len=%d\n", __func__ , (int)skb->len);
-
-	IRDA_ASSERT(self != NULL, return -RSP_PROTOCOL_ERROR;);
-	IRDA_ASSERT(self->magic == IRLAN_MAGIC, return -RSP_PROTOCOL_ERROR;);
-
-	if (!skb)
-		return -RSP_PROTOCOL_ERROR;
-
-	frame = skb->data;
-
-	name = kmalloc(255, GFP_ATOMIC);
-	if (!name)
-		return -RSP_INSUFFICIENT_RESOURCES;
-	value = kmalloc(1016, GFP_ATOMIC);
-	if (!value) {
-		kfree(name);
-		return -RSP_INSUFFICIENT_RESOURCES;
-	}
-
-	/* How many parameters? */
-	count = frame[1];
-
-	pr_debug("Got %d parameters\n", count);
-
-	ptr = frame+2;
-
-	/* For all parameters */
-	for (i=0; i<count;i++) {
-		ret = irlan_extract_param(ptr, name, value, &val_len);
-		if (ret < 0) {
-			pr_debug("%s(), IrLAN, Error!\n", __func__);
-			break;
-		}
-		ptr+=ret;
-		ret = RSP_SUCCESS;
-		irlan_check_command_param(self, name, value);
-	}
-	/* Cleanup */
-	kfree(name);
-	kfree(value);
-
-	return ret;
-}
-
-/*
- * Function irlan_provider_send_reply (self, info)
- *
- *    Send reply to query to peer IrLAN layer
- *
- */
-void irlan_provider_send_reply(struct irlan_cb *self, int command,
-			       int ret_code)
-{
-	struct sk_buff *skb;
-
-	IRDA_ASSERT(self != NULL, return;);
-	IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
-
-	skb = alloc_skb(IRLAN_MAX_HEADER + IRLAN_CMD_HEADER +
-			/* Bigger param length comes from CMD_GET_MEDIA_CHAR */
-			IRLAN_STRING_PARAMETER_LEN("FILTER_TYPE", "DIRECTED") +
-			IRLAN_STRING_PARAMETER_LEN("FILTER_TYPE", "BROADCAST") +
-			IRLAN_STRING_PARAMETER_LEN("FILTER_TYPE", "MULTICAST") +
-			IRLAN_STRING_PARAMETER_LEN("ACCESS_TYPE", "HOSTED"),
-			GFP_ATOMIC);
-
-	if (!skb)
-		return;
-
-	/* Reserve space for TTP, LMP, and LAP header */
-	skb_reserve(skb, self->provider.max_header_size);
-	skb_put(skb, 2);
-
-	switch (command) {
-	case CMD_GET_PROVIDER_INFO:
-		skb->data[0] = 0x00; /* Success */
-		skb->data[1] = 0x02; /* 2 parameters */
-		switch (self->media) {
-		case MEDIA_802_3:
-			irlan_insert_string_param(skb, "MEDIA", "802.3");
-			break;
-		case MEDIA_802_5:
-			irlan_insert_string_param(skb, "MEDIA", "802.5");
-			break;
-		default:
-			pr_debug("%s(), unknown media type!\n", __func__);
-			break;
-		}
-		irlan_insert_short_param(skb, "IRLAN_VER", 0x0101);
-		break;
-
-	case CMD_GET_MEDIA_CHAR:
-		skb->data[0] = 0x00; /* Success */
-		skb->data[1] = 0x05; /* 5 parameters */
-		irlan_insert_string_param(skb, "FILTER_TYPE", "DIRECTED");
-		irlan_insert_string_param(skb, "FILTER_TYPE", "BROADCAST");
-		irlan_insert_string_param(skb, "FILTER_TYPE", "MULTICAST");
-
-		switch (self->provider.access_type) {
-		case ACCESS_DIRECT:
-			irlan_insert_string_param(skb, "ACCESS_TYPE", "DIRECT");
-			break;
-		case ACCESS_PEER:
-			irlan_insert_string_param(skb, "ACCESS_TYPE", "PEER");
-			break;
-		case ACCESS_HOSTED:
-			irlan_insert_string_param(skb, "ACCESS_TYPE", "HOSTED");
-			break;
-		default:
-			pr_debug("%s(), Unknown access type\n", __func__);
-			break;
-		}
-		irlan_insert_short_param(skb, "MAX_FRAME", 0x05ee);
-		break;
-	case CMD_OPEN_DATA_CHANNEL:
-		skb->data[0] = 0x00; /* Success */
-		if (self->provider.send_arb_val) {
-			skb->data[1] = 0x03; /* 3 parameters */
-			irlan_insert_short_param(skb, "CON_ARB",
-						 self->provider.send_arb_val);
-		} else
-			skb->data[1] = 0x02; /* 2 parameters */
-		irlan_insert_byte_param(skb, "DATA_CHAN", self->stsap_sel_data);
-		irlan_insert_string_param(skb, "RECONNECT_KEY", "LINUX RULES!");
-		break;
-	case CMD_FILTER_OPERATION:
-		irlan_filter_request(self, skb);
-		break;
-	default:
-		pr_debug("%s(), Unknown command!\n", __func__);
-		break;
-	}
-
-	irttp_data_request(self->provider.tsap_ctrl, skb);
-}
-
-/*
- * Function irlan_provider_register(void)
- *
- *    Register provider support so we can accept incoming connections.
- *
- */
-int irlan_provider_open_ctrl_tsap(struct irlan_cb *self)
-{
-	struct tsap_cb *tsap;
-	notify_t notify;
-
-	IRDA_ASSERT(self != NULL, return -1;);
-	IRDA_ASSERT(self->magic == IRLAN_MAGIC, return -1;);
-
-	/* Check if already open */
-	if (self->provider.tsap_ctrl)
-		return -1;
-
-	/*
-	 *  First register well known control TSAP
-	 */
-	irda_notify_init(&notify);
-	notify.data_indication       = irlan_provider_data_indication;
-	notify.connect_indication    = irlan_provider_connect_indication;
-	notify.disconnect_indication = irlan_provider_disconnect_indication;
-	notify.instance = self;
-	strlcpy(notify.name, "IrLAN ctrl (p)", sizeof(notify.name));
-
-	tsap = irttp_open_tsap(LSAP_ANY, 1, &notify);
-	if (!tsap) {
-		pr_debug("%s(), Got no tsap!\n", __func__);
-		return -1;
-	}
-	self->provider.tsap_ctrl = tsap;
-
-	/* Register with LM-IAS */
-	irlan_ias_register(self, tsap->stsap_sel);
-
-	return 0;
-}
-
diff --git a/net/irda/irlan/irlan_provider_event.c b/net/irda/irlan/irlan_provider_event.c
deleted file mode 100644
index 9c4f7f51d6b5..000000000000
--- a/net/irda/irlan/irlan_provider_event.c
+++ /dev/null
@@ -1,233 +0,0 @@
-/*********************************************************************
- *
- * Filename:      irlan_provider_event.c
- * Version:       0.9
- * Description:   IrLAN provider state machine)
- * Status:        Experimental.
- * Author:        Dag Brattli <dagb@cs.uit.no>
- * Created at:    Sun Aug 31 20:14:37 1997
- * Modified at:   Sat Oct 30 12:52:41 1999
- * Modified by:   Dag Brattli <dagb@cs.uit.no>
- *
- *     Copyright (c) 1998-1999 Dag Brattli <dagb@cs.uit.no>, All Rights Reserved.
- *
- *     This program is free software; you can redistribute it and/or
- *     modify it under the terms of the GNU General Public License as
- *     published by the Free Software Foundation; either version 2 of
- *     the License, or (at your option) any later version.
- *
- *     Neither Dag Brattli nor University of Tromsø admit liability nor
- *     provide warranty for any of this software. This material is
- *     provided "AS-IS" and at no charge.
- *
- ********************************************************************/
-
-#include <net/irda/irda.h>
-#include <net/irda/iriap.h>
-#include <net/irda/irlmp.h>
-#include <net/irda/irttp.h>
-
-#include <net/irda/irlan_provider.h>
-#include <net/irda/irlan_event.h>
-
-static int irlan_provider_state_idle(struct irlan_cb *self, IRLAN_EVENT event,
-				     struct sk_buff *skb);
-static int irlan_provider_state_info(struct irlan_cb *self, IRLAN_EVENT event,
-				     struct sk_buff *skb);
-static int irlan_provider_state_open(struct irlan_cb *self, IRLAN_EVENT event,
-				     struct sk_buff *skb);
-static int irlan_provider_state_data(struct irlan_cb *self, IRLAN_EVENT event,
-				     struct sk_buff *skb);
-
-static int (*state[])(struct irlan_cb *self, IRLAN_EVENT event,
-		      struct sk_buff *skb) =
-{
-	irlan_provider_state_idle,
-	NULL, /* Query */
-	NULL, /* Info */
-	irlan_provider_state_info,
-	NULL, /* Media */
-	irlan_provider_state_open,
-	NULL, /* Wait */
-	NULL, /* Arb */
-	irlan_provider_state_data,
-	NULL, /* Close */
-	NULL, /* Sync */
-};
-
-void irlan_do_provider_event(struct irlan_cb *self, IRLAN_EVENT event,
-			     struct sk_buff *skb)
-{
-	IRDA_ASSERT(*state[ self->provider.state] != NULL, return;);
-
-	(*state[self->provider.state]) (self, event, skb);
-}
-
-/*
- * Function irlan_provider_state_idle (event, skb, info)
- *
- *    IDLE, We are waiting for an indication that there is a provider
- *    available.
- */
-static int irlan_provider_state_idle(struct irlan_cb *self, IRLAN_EVENT event,
-				     struct sk_buff *skb)
-{
-	IRDA_ASSERT(self != NULL, return -1;);
-
-	switch(event) {
-	case IRLAN_CONNECT_INDICATION:
-	     irlan_provider_connect_response( self, self->provider.tsap_ctrl);
-	     irlan_next_provider_state( self, IRLAN_INFO);
-	     break;
-	default:
-		pr_debug("%s(), Unknown event %d\n", __func__ , event);
-		break;
-	}
-	if (skb)
-		dev_kfree_skb(skb);
-
-	return 0;
-}
-
-/*
- * Function irlan_provider_state_info (self, event, skb, info)
- *
- *    INFO, We have issued a GetInfo command and is awaiting a reply.
- */
-static int irlan_provider_state_info(struct irlan_cb *self, IRLAN_EVENT event,
-				     struct sk_buff *skb)
-{
-	int ret;
-
-	IRDA_ASSERT(self != NULL, return -1;);
-
-	switch(event) {
-	case IRLAN_GET_INFO_CMD:
-		/* Be sure to use 802.3 in case of peer mode */
-		if (self->provider.access_type == ACCESS_PEER) {
-			self->media = MEDIA_802_3;
-
-			/* Check if client has started yet */
-			if (self->client.state == IRLAN_IDLE) {
-				/* This should get the client going */
-				irlmp_discovery_request(8);
-			}
-		}
-
-		irlan_provider_send_reply(self, CMD_GET_PROVIDER_INFO,
-					  RSP_SUCCESS);
-		/* Keep state */
-		break;
-	case IRLAN_GET_MEDIA_CMD:
-		irlan_provider_send_reply(self, CMD_GET_MEDIA_CHAR,
-					  RSP_SUCCESS);
-		/* Keep state */
-		break;
-	case IRLAN_OPEN_DATA_CMD:
-		ret = irlan_parse_open_data_cmd(self, skb);
-		if (self->provider.access_type == ACCESS_PEER) {
-			/* FIXME: make use of random functions! */
-			self->provider.send_arb_val = (jiffies & 0xffff);
-		}
-		irlan_provider_send_reply(self, CMD_OPEN_DATA_CHANNEL, ret);
-
-		if (ret == RSP_SUCCESS) {
-			irlan_next_provider_state(self, IRLAN_OPEN);
-
-			/* Signal client that we are now open */
-			irlan_do_client_event(self, IRLAN_PROVIDER_SIGNAL, NULL);
-		}
-		break;
-	case IRLAN_LMP_DISCONNECT:  /* FALLTHROUGH */
-	case IRLAN_LAP_DISCONNECT:
-		irlan_next_provider_state(self, IRLAN_IDLE);
-		break;
-	default:
-		pr_debug("%s(), Unknown event %d\n", __func__ , event);
-		break;
-	}
-	if (skb)
-		dev_kfree_skb(skb);
-
-	return 0;
-}
-
-/*
- * Function irlan_provider_state_open (self, event, skb, info)
- *
- *    OPEN, The client has issued a OpenData command and is awaiting a
- *    reply
- *
- */
-static int irlan_provider_state_open(struct irlan_cb *self, IRLAN_EVENT event,
-				     struct sk_buff *skb)
-{
-	IRDA_ASSERT(self != NULL, return -1;);
-
-	switch(event) {
-	case IRLAN_FILTER_CONFIG_CMD:
-		irlan_provider_parse_command(self, CMD_FILTER_OPERATION, skb);
-		irlan_provider_send_reply(self, CMD_FILTER_OPERATION,
-					  RSP_SUCCESS);
-		/* Keep state */
-		break;
-	case IRLAN_DATA_CONNECT_INDICATION:
-		irlan_next_provider_state(self, IRLAN_DATA);
-		irlan_provider_connect_response(self, self->tsap_data);
-		break;
-	case IRLAN_LMP_DISCONNECT:  /* FALLTHROUGH */
-	case IRLAN_LAP_DISCONNECT:
-		irlan_next_provider_state(self, IRLAN_IDLE);
-		break;
-	default:
-		pr_debug("%s(), Unknown event %d\n", __func__ , event);
-		break;
-	}
-	if (skb)
-		dev_kfree_skb(skb);
-
-	return 0;
-}
-
-/*
- * Function irlan_provider_state_data (self, event, skb, info)
- *
- *    DATA, The data channel is connected, allowing data transfers between
- *    the local and remote machines.
- *
- */
-static int irlan_provider_state_data(struct irlan_cb *self, IRLAN_EVENT event,
-				     struct sk_buff *skb)
-{
-	IRDA_ASSERT(self != NULL, return -1;);
-	IRDA_ASSERT(self->magic == IRLAN_MAGIC, return -1;);
-
-	switch(event) {
-	case IRLAN_FILTER_CONFIG_CMD:
-		irlan_provider_parse_command(self, CMD_FILTER_OPERATION, skb);
-		irlan_provider_send_reply(self, CMD_FILTER_OPERATION,
-					  RSP_SUCCESS);
-		break;
-	case IRLAN_LMP_DISCONNECT: /* FALLTHROUGH */
-	case IRLAN_LAP_DISCONNECT:
-		irlan_next_provider_state(self, IRLAN_IDLE);
-		break;
-	default:
-		pr_debug("%s(), Unknown event %d\n", __func__ , event);
-		break;
-	}
-	if (skb)
-		dev_kfree_skb(skb);
-
-	return 0;
-}
-
-
-
-
-
-
-
-
-
-