Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...

[linux-2.6.git] / include / net / irda / irlmp.h

diff --git a/include/net/irda/irlmp.h b/include/net/irda/irlmp.h
index 2f0c8f3..11ecfa5 100644 (file)
--- a/include/net/irda/irlmp.h
+++ b/include/net/irda/irlmp.h
@@ -29,7 +29,6 @@
 
 #include <asm/param.h>  /* for HZ */
 
-#include <linux/config.h>
 #include <linux/types.h>
 
 #include <net/irda/irda.h>
@@ -112,7 +111,7 @@ struct lsap_cb {
 
        struct timer_list watchdog_timer;
 
-       IRLMP_STATE     lsap_state;  /* Connection state */
+       LSAP_STATE      lsap_state;  /* Connection state */
        notify_t        notify;      /* Indication/Confirm entry points */
        struct qos_info qos;         /* QoS for this connection */
 
@@ -175,7 +174,8 @@ struct irlmp_cb {
        discovery_t discovery_cmd; /* Discovery command to use by IrLAP */
        discovery_t discovery_rsp; /* Discovery response to use by IrLAP */
 
-       int free_lsap_sel;
+       /* Last lsap picked automatically by irlmp_find_free_slsap() */
+       int     last_lsap_sel;
 
        struct timer_list discovery_timer;
 
@@ -241,17 +241,14 @@ int  irlmp_connless_data_request(struct lsap_cb *, struct sk_buff *, __u8);
 void irlmp_connless_data_indication(struct lsap_cb *, struct sk_buff *);
 #endif /* CONFIG_IRDA_ULTRA */
 
-void irlmp_status_request(void);
 void irlmp_status_indication(struct lap_cb *, LINK_STATUS link, LOCK_STATUS lock);
 void irlmp_flow_indication(struct lap_cb *self, LOCAL_FLOW flow);
 
-int  irlmp_slsap_inuse(__u8 slsap);
-__u8 irlmp_find_free_slsap(void);
 LM_REASON irlmp_convert_lap_reason(LAP_REASON);
 
 static inline __u32 irlmp_get_saddr(const struct lsap_cb *self)
 {
-       return (self && !self->lap) ? self->lap->saddr : 0;
+       return (self && self->lap) ? self->lap->saddr : 0;
 }
 
 static inline __u32 irlmp_get_daddr(const struct lsap_cb *self)