]> pilppa.org Git - linux-2.6-omap-h63xx.git/blobdiff - net/irda/ircomm/ircomm_lmp.c
[PATCH] remove many unneeded #includes of sched.h
[linux-2.6-omap-h63xx.git] / net / irda / ircomm / ircomm_lmp.c
index 959874b6451f00cf9edf4ad23343a1cd07e73b5b..55860ee4e39e94cf68e08c4efe2c8e4b9bc9b3d1 100644 (file)
@@ -1,5 +1,5 @@
 /*********************************************************************
- *                
+ *
  * Filename:      ircomm_lmp.c
  * Version:       1.0
  * Description:   Interface between IrCOMM and IrLMP
@@ -9,28 +9,27 @@
  * Modified at:   Sun Dec 12 13:44:17 1999
  * Modified by:   Dag Brattli <dagb@cs.uit.no>
  * Sources:       Previous IrLPT work by Thomas Davis
- * 
+ *
  *     Copyright (c) 1999 Dag Brattli, All Rights Reserved.
  *     Copyright (c) 2000-2003 Jean Tourrilhes <jt@hpl.hp.com>
- *     
- *     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 
+ *
+ *     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.
- * 
+ *
  *     This program is distributed in the hope that it will be useful,
  *     but WITHOUT ANY WARRANTY; without even the implied warranty of
  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  *     GNU General Public License for more details.
- * 
- *     You should have received a copy of the GNU General Public License 
- *     along with this program; if not, write to the Free Software 
- *     Foundation, Inc., 59 Temple Place, Suite 330, Boston, 
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program; if not, write to the Free Software
+ *     Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  *     MA 02111-1307 USA
- *     
+ *
  ********************************************************************/
 
-#include <linux/sched.h>
 #include <linux/init.h>
 
 #include <net/irda/irda.h>
 /*
  * Function ircomm_lmp_connect_request (self, userdata)
  *
- *    
+ *
  *
  */
-static int ircomm_lmp_connect_request(struct ircomm_cb *self, 
-                                     struct sk_buff *userdata, 
+static int ircomm_lmp_connect_request(struct ircomm_cb *self,
+                                     struct sk_buff *userdata,
                                      struct ircomm_info *info)
 {
        int ret = 0;
@@ -61,14 +60,14 @@ static int ircomm_lmp_connect_request(struct ircomm_cb *self,
                skb_get(userdata);
 
        ret = irlmp_connect_request(self->lsap, info->dlsap_sel,
-                                   info->saddr, info->daddr, NULL, userdata); 
+                                   info->saddr, info->daddr, NULL, userdata);
        return ret;
-}      
+}
 
 /*
  * Function ircomm_lmp_connect_response (self, skb)
  *
- *    
+ *
  *
  */
 static int ircomm_lmp_connect_response(struct ircomm_cb *self,
@@ -78,18 +77,18 @@ static int ircomm_lmp_connect_response(struct ircomm_cb *self,
        int ret;
 
        IRDA_DEBUG(0, "%s()\n", __FUNCTION__ );
-       
+
        /* Any userdata supplied? */
        if (userdata == NULL) {
-               tx_skb = alloc_skb(64, GFP_ATOMIC);
+               tx_skb = alloc_skb(LMP_MAX_HEADER, GFP_ATOMIC);
                if (!tx_skb)
                        return -ENOMEM;
 
                /* Reserve space for MUX and LAP header */
                skb_reserve(tx_skb, LMP_MAX_HEADER);
        } else {
-               /*  
-                *  Check that the client has reserved enough space for 
+               /*
+                *  Check that the client has reserved enough space for
                 *  headers
                 */
                IRDA_ASSERT(skb_headroom(userdata) >= LMP_MAX_HEADER,
@@ -105,22 +104,22 @@ static int ircomm_lmp_connect_response(struct ircomm_cb *self,
        return 0;
 }
 
-static int ircomm_lmp_disconnect_request(struct ircomm_cb *self, 
-                                        struct sk_buff *userdata, 
+static int ircomm_lmp_disconnect_request(struct ircomm_cb *self,
+                                        struct sk_buff *userdata,
                                         struct ircomm_info *info)
 {
-        struct sk_buff *tx_skb;
+       struct sk_buff *tx_skb;
        int ret;
 
        IRDA_DEBUG(0, "%s()\n", __FUNCTION__ );
 
-        if (!userdata) {
-               tx_skb = alloc_skb(64, GFP_ATOMIC);
+       if (!userdata) {
+               tx_skb = alloc_skb(LMP_MAX_HEADER, GFP_ATOMIC);
                if (!tx_skb)
                        return -ENOMEM;
-               
+
                /*  Reserve space for MUX and LAP header */
-               skb_reserve(tx_skb, LMP_MAX_HEADER);            
+               skb_reserve(tx_skb, LMP_MAX_HEADER);
                userdata = tx_skb;
        } else {
                /* Don't forget to refcount it - should be NULL anyway */
@@ -136,7 +135,7 @@ static int ircomm_lmp_disconnect_request(struct ircomm_cb *self,
  * Function ircomm_lmp_flow_control (skb)
  *
  *    This function is called when a data frame we have sent to IrLAP has
- *    been deallocated. We do this to make sure we don't flood IrLAP with 
+ *    been deallocated. We do this to make sure we don't flood IrLAP with
  *    frames, since we are not using the IrTTP flow control mechanism
  */
 static void ircomm_lmp_flow_control(struct sk_buff *skb)
@@ -150,29 +149,29 @@ static void ircomm_lmp_flow_control(struct sk_buff *skb)
        cb = (struct irda_skb_cb *) skb->cb;
 
        IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
-        line = cb->line;
+
+       line = cb->line;
 
        self = (struct ircomm_cb *) hashbin_lock_find(ircomm, line, NULL);
-        if (!self) {
+       if (!self) {
                IRDA_DEBUG(2, "%s(), didn't find myself\n", __FUNCTION__ );
-                return;
+               return;
        }
 
-        IRDA_ASSERT(self != NULL, return;);
+       IRDA_ASSERT(self != NULL, return;);
        IRDA_ASSERT(self->magic == IRCOMM_MAGIC, return;);
 
        self->pkt_count--;
 
-        if ((self->pkt_count < 2) && (self->flow_status == FLOW_STOP)) {
-                IRDA_DEBUG(2, "%s(), asking TTY to start again!\n", __FUNCTION__ );
-                self->flow_status = FLOW_START;
-                if (self->notify.flow_indication)
-                        self->notify.flow_indication(self->notify.instance, 
+       if ((self->pkt_count < 2) && (self->flow_status == FLOW_STOP)) {
+               IRDA_DEBUG(2, "%s(), asking TTY to start again!\n", __FUNCTION__ );
+               self->flow_status = FLOW_START;
+               if (self->notify.flow_indication)
+                       self->notify.flow_indication(self->notify.instance,
                                                     self, FLOW_START);
-        }
+       }
 }
-    
+
 /*
  * Function ircomm_lmp_data_request (self, userdata)
  *
@@ -180,7 +179,7 @@ static void ircomm_lmp_flow_control(struct sk_buff *skb)
  *
  */
 static int ircomm_lmp_data_request(struct ircomm_cb *self,
-                                  struct sk_buff *skb, 
+                                  struct sk_buff *skb,
                                   int not_used)
 {
        struct irda_skb_cb *cb;
@@ -189,8 +188,8 @@ static int ircomm_lmp_data_request(struct ircomm_cb *self,
        IRDA_ASSERT(skb != NULL, return -1;);
 
        cb = (struct irda_skb_cb *) skb->cb;
-       
-        cb->line = self->line;
+
+       cb->line = self->line;
 
        IRDA_DEBUG(4, "%s(), sending frame\n", __FUNCTION__ );
 
@@ -199,13 +198,13 @@ static int ircomm_lmp_data_request(struct ircomm_cb *self,
 
        skb->destructor = ircomm_lmp_flow_control;
 
-        if ((self->pkt_count++ > 7) && (self->flow_status == FLOW_START)) {
+       if ((self->pkt_count++ > 7) && (self->flow_status == FLOW_START)) {
                IRDA_DEBUG(2, "%s(), asking TTY to slow down!\n", __FUNCTION__ );
-               self->flow_status = FLOW_STOP;
-                if (self->notify.flow_indication)
-                       self->notify.flow_indication(self->notify.instance, 
-                                                    self, FLOW_STOP);
-        }
+               self->flow_status = FLOW_STOP;
+               if (self->notify.flow_indication)
+                       self->notify.flow_indication(self->notify.instance,
+                                                    self, FLOW_STOP);
+       }
        ret = irlmp_data_request(self->lsap, skb);
        if (ret) {
                IRDA_ERROR("%s(), failed\n", __FUNCTION__);
@@ -227,11 +226,11 @@ static int ircomm_lmp_data_indication(void *instance, void *sap,
        struct ircomm_cb *self = (struct ircomm_cb *) instance;
 
        IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
-       
+
        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_LMP_DATA_INDICATION, skb, NULL);
 
        /* Drop reference count - see ircomm_tty_data_indication(). */
@@ -241,15 +240,15 @@ static int ircomm_lmp_data_indication(void *instance, void *sap,
 }
 
 /*
- * Function ircomm_lmp_connect_confirm (instance, sap, qos, max_sdu_size, 
+ * Function ircomm_lmp_connect_confirm (instance, sap, qos, max_sdu_size,
  *                                       max_header_size, skb)
  *
  *    Connection has been confirmed by peer device
  *
  */
 static void ircomm_lmp_connect_confirm(void *instance, void *sap,
-                                      struct qos_info *qos, 
-                                      __u32 max_seg_size, 
+                                      struct qos_info *qos,
+                                      __u32 max_seg_size,
                                       __u8 max_header_size,
                                       struct sk_buff *skb)
 {
@@ -312,7 +311,7 @@ static void ircomm_lmp_connect_indication(void *instance, void *sap,
  *    Peer device has closed the connection, or the link went down for some
  *    other reason
  */
-static void ircomm_lmp_disconnect_indication(void *instance, void *sap, 
+static void ircomm_lmp_disconnect_indication(void *instance, void *sap,
                                             LM_REASON reason,
                                             struct sk_buff *skb)
 {