vserver 2.0 rc7

[linux-2.6.git] / net / irda / ircomm / ircomm_ttp.c

diff --git a/net/irda/ircomm/ircomm_ttp.c b/net/irda/ircomm/ircomm_ttp.c
index 6dafe0b..d98bf35 100644 (file)
--- a/net/irda/ircomm/ircomm_ttp.c
+++ b/net/irda/ircomm/ircomm_ttp.c
@@ -172,7 +172,7 @@ static int ircomm_ttp_data_request(struct ircomm_cb *self,
 {
        int ret;
 
-       ASSERT(skb != NULL, return -1;);
+       IRDA_ASSERT(skb != NULL, return -1;);
 
        IRDA_DEBUG(2, "%s(), clen=%d\n", __FUNCTION__ , clen);
 
@@ -180,7 +180,7 @@ static int ircomm_ttp_data_request(struct ircomm_cb *self,
         * Insert clen field, currently we either send data only, or control
         * only frames, to make things easier and avoid queueing
         */
-       ASSERT(skb_headroom(skb) >= IRCOMM_HEADER_SIZE, return -1;);
+       IRDA_ASSERT(skb_headroom(skb) >= IRCOMM_HEADER_SIZE, return -1;);
 
        /* Don't forget to refcount it - see ircomm_tty_do_softint() */
        skb_get(skb);
@@ -191,7 +191,7 @@ static int ircomm_ttp_data_request(struct ircomm_cb *self,
 
        ret = irttp_data_request(self->tsap, skb);
        if (ret) {
-               ERROR("%s(), failed\n", __FUNCTION__);
+               IRDA_ERROR("%s(), failed\n", __FUNCTION__);
                /* irttp_data_request already free the packet */
        }
 
@@ -211,9 +211,9 @@ static int ircomm_ttp_data_indication(void *instance, void *sap,
 
        IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
        
-       ASSERT(self != NULL, return -1;);
-       ASSERT(self->magic == IRCOMM_MAGIC, return -1;);
-       ASSERT(skb != NULL, return -1;);
+       IRDA_ASSERT(self != NULL, return -1;);
+       IRDA_ASSERT(self->magic == IRCOMM_MAGIC, return -1;);
+       IRDA_ASSERT(skb != NULL, return -1;);
 
        ircomm_do_event(self, IRCOMM_TTP_DATA_INDICATION, skb, NULL);
 
@@ -234,13 +234,14 @@ static void ircomm_ttp_connect_confirm(void *instance, void *sap,
 
        IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
 
-       ASSERT(self != NULL, return;);
-       ASSERT(self->magic == IRCOMM_MAGIC, return;);
-       ASSERT(skb != NULL, return;);
-       ASSERT(qos != NULL, goto out;);
+       IRDA_ASSERT(self != NULL, return;);
+       IRDA_ASSERT(self->magic == IRCOMM_MAGIC, return;);
+       IRDA_ASSERT(skb != NULL, return;);
+       IRDA_ASSERT(qos != NULL, goto out;);
 
        if (max_sdu_size != TTP_SAR_DISABLE) {
-               ERROR("%s(), SAR not allowed for IrCOMM!\n", __FUNCTION__);
+               IRDA_ERROR("%s(), SAR not allowed for IrCOMM!\n",
+                          __FUNCTION__);
                goto out;
        }
 
@@ -274,13 +275,14 @@ static void ircomm_ttp_connect_indication(void *instance, void *sap,
 
        IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
 
-       ASSERT(self != NULL, return;);
-       ASSERT(self->magic == IRCOMM_MAGIC, return;);
-       ASSERT(skb != NULL, return;);
-       ASSERT(qos != NULL, goto out;);
+       IRDA_ASSERT(self != NULL, return;);
+       IRDA_ASSERT(self->magic == IRCOMM_MAGIC, return;);
+       IRDA_ASSERT(skb != NULL, return;);
+       IRDA_ASSERT(qos != NULL, goto out;);
 
        if (max_sdu_size != TTP_SAR_DISABLE) {
-               ERROR("%s(), SAR not allowed for IrCOMM!\n", __FUNCTION__);
+               IRDA_ERROR("%s(), SAR not allowed for IrCOMM!\n",
+                          __FUNCTION__);
                goto out;
        }
 
@@ -332,8 +334,8 @@ static void ircomm_ttp_disconnect_indication(void *instance, void *sap,
 
        IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
 
-       ASSERT(self != NULL, return;);
-       ASSERT(self->magic == IRCOMM_MAGIC, return;);
+       IRDA_ASSERT(self != NULL, return;);
+       IRDA_ASSERT(self->magic == IRCOMM_MAGIC, return;);
 
        info.reason = reason;
 
@@ -357,8 +359,8 @@ static void ircomm_ttp_flow_indication(void *instance, void *sap,
 
        IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
 
-       ASSERT(self != NULL, return;);
-       ASSERT(self->magic == IRCOMM_MAGIC, return;);
+       IRDA_ASSERT(self != NULL, return;);
+       IRDA_ASSERT(self->magic == IRCOMM_MAGIC, return;);
        
        if (self->notify.flow_indication)
                self->notify.flow_indication(self->notify.instance, self, cmd);