#include <linux/netdevice.h>
#include <linux/etherdevice.h>
#include <linux/if_arp.h>
+#include <linux/bitops.h>
#include <net/arp.h>
#include <asm/system.h>
-#include <asm/bitops.h>
#include <asm/byteorder.h>
#include <net/irda/irda.h>
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)
{
IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
- ASSERT(self != NULL, return;);
- ASSERT(self->magic == IRLAN_MAGIC, return;);
+ 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
}
}
-void irlan_client_start_kick_timer(struct irlan_cb *self, int timeout)
+static void irlan_client_start_kick_timer(struct irlan_cb *self, int timeout)
{
IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
{
IRDA_DEBUG(1, "%s()\n", __FUNCTION__ );
- ASSERT(self != NULL, return;);
- ASSERT(self->magic == IRLAN_MAGIC, return;);
+ 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
IRDA_DEBUG(1, "%s()\n", __FUNCTION__ );
- ASSERT(discovery != NULL, return;);
+ IRDA_ASSERT(discovery != NULL, return;);
/*
* I didn't check it, but I bet that IrLAN suffer from the same
rcu_read_lock();
self = irlan_get_any();
if (self) {
- ASSERT(self->magic == IRLAN_MAGIC, return;);
+ IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
IRDA_DEBUG(1, "%s(), Found instance (%08x)!\n", __FUNCTION__ ,
daddr);
self = (struct irlan_cb *) instance;
- ASSERT(self != NULL, return -1;);
- ASSERT(self->magic == IRLAN_MAGIC, return -1;);
- ASSERT(skb != NULL, return -1;);
+ 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);
self = (struct irlan_cb *) instance;
tsap = (struct tsap_cb *) sap;
- ASSERT(self != NULL, return;);
- ASSERT(self->magic == IRLAN_MAGIC, return;);
- ASSERT(tsap != NULL, return;);
- ASSERT(tsap->magic == TTP_TSAP_MAGIC, return;);
+ 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;);
- ASSERT(tsap == self->client.tsap_ctrl, return;);
+ IRDA_ASSERT(tsap == self->client.tsap_ctrl, return;);
/* Remove frames queued on the control channel */
- while ((skb = skb_dequeue(&self->client.txq))) {
+ while ((skb = skb_dequeue(&self->client.txq)) != NULL) {
dev_kfree_skb(skb);
}
self->client.tx_busy = FALSE;
* Initialize callbacks and open IrTTP TSAPs
*
*/
-void irlan_client_open_ctrl_tsap(struct irlan_cb *self)
+static void irlan_client_open_ctrl_tsap(struct irlan_cb *self)
{
struct tsap_cb *tsap;
notify_t notify;
IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
- ASSERT(self != NULL, return;);
- ASSERT(self->magic == IRLAN_MAGIC, return;);
+ IRDA_ASSERT(self != NULL, return;);
+ IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
/* Check if already open */
if (self->client.tsap_ctrl)
self = (struct irlan_cb *) instance;
- ASSERT(self != NULL, return;);
- ASSERT(self->magic == IRLAN_MAGIC, return;);
+ 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;
irlan_do_client_event(self, IRLAN_CONNECT_COMPLETE, NULL);
}
-/*
- * Function irlan_client_reconnect_data_channel (self)
- *
- * Try to reconnect data channel (currently not used)
- *
- */
-void irlan_client_reconnect_data_channel(struct irlan_cb *self)
-{
- struct sk_buff *skb;
- __u8 *frame;
-
- IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
-
- ASSERT(self != NULL, return;);
- ASSERT(self->magic == IRLAN_MAGIC, return;);
-
- skb = dev_alloc_skb(128);
- 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_RECONNECT_DATA_CHAN;
- frame[1] = 0x01;
- irlan_insert_array_param(skb, "RECONNECT_KEY",
- self->client.reconnect_key,
- self->client.key_len);
-
- irttp_data_request(self->client.tsap_ctrl, skb);
-}
-
-
/*
* Function print_ret_code (code)
*
printk(KERN_INFO "Success\n");
break;
case 1:
- WARNING("IrLAN: Insufficient resources\n");
+ IRDA_WARNING("IrLAN: Insufficient resources\n");
break;
case 2:
- WARNING("IrLAN: Invalid command format\n");
+ IRDA_WARNING("IrLAN: Invalid command format\n");
break;
case 3:
- WARNING("IrLAN: Command not supported\n");
+ IRDA_WARNING("IrLAN: Command not supported\n");
break;
case 4:
- WARNING("IrLAN: Parameter not supported\n");
+ IRDA_WARNING("IrLAN: Parameter not supported\n");
break;
case 5:
- WARNING("IrLAN: Value not supported\n");
+ IRDA_WARNING("IrLAN: Value not supported\n");
break;
case 6:
- WARNING("IrLAN: Not open\n");
+ IRDA_WARNING("IrLAN: Not open\n");
break;
case 7:
- WARNING("IrLAN: Authentication required\n");
+ IRDA_WARNING("IrLAN: Authentication required\n");
break;
case 8:
- WARNING("IrLAN: Invalid password\n");
+ IRDA_WARNING("IrLAN: Invalid password\n");
break;
case 9:
- WARNING("IrLAN: Protocol error\n");
+ IRDA_WARNING("IrLAN: Protocol error\n");
break;
case 255:
- WARNING("IrLAN: Asynchronous status\n");
+ IRDA_WARNING("IrLAN: Asynchronous status\n");
break;
}
}
char *name;
char *value;
- ASSERT(skb != NULL, return;);
+ IRDA_ASSERT(skb != NULL, return;);
IRDA_DEBUG(4, "%s() skb->len=%d\n", __FUNCTION__ , (int) skb->len);
- ASSERT(self != NULL, return;);
- ASSERT(self->magic == IRLAN_MAGIC, return;);
+ IRDA_ASSERT(self != NULL, return;);
+ IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
if (!skb) {
- ERROR("%s(), Got NULL skb!\n", __FUNCTION__);
+ IRDA_ERROR("%s(), Got NULL skb!\n", __FUNCTION__);
return;
}
frame = skb->data;
IRDA_DEBUG(4, "%s(), parm=%s\n", __FUNCTION__ , param);
- ASSERT(self != NULL, return;);
- ASSERT(self->magic == IRLAN_MAGIC, return;);
+ IRDA_ASSERT(self != NULL, return;);
+ IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
/* Media type */
if (strcmp(param, "MEDIA") == 0) {
IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
- ASSERT(priv != NULL, return;);
+ IRDA_ASSERT(priv != NULL, return;);
self = (struct irlan_cb *) priv;
- ASSERT(self->magic == IRLAN_MAGIC, return;);
+ IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
/* We probably don't need to make any more queries */
iriap_close(self->client.iriap);