diff options
| author | Jeff Garzik <jgarzik@redhat.com> | 2003-05-25 11:25:32 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2003-05-25 11:25:32 -0400 |
| commit | 4bcb7d97a86e7b3e73b4c9ccd29483c26fce3a8d (patch) | |
| tree | 9803d2151e1693be7fba64aa96d90b1df6f9b9f5 /include | |
| parent | dc2f9764e8784817355504b5a78bed08578e2d46 (diff) | |
| parent | 2fab8e81e88054bbf5c82e888d5bb127fc61e4ad (diff) | |
Merge redhat.com:/garz/repo/linus-2.5
into redhat.com:/garz/repo/irda-2.5
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/irda/iriap.h | 2 | ||||
| -rw-r--r-- | include/net/irda/irlmp_event.h | 20 | ||||
| -rw-r--r-- | include/net/irda/irport.h | 1 |
3 files changed, 2 insertions, 21 deletions
diff --git a/include/net/irda/iriap.h b/include/net/irda/iriap.h index 917e6701e7ab..ccd692fdef36 100644 --- a/include/net/irda/iriap.h +++ b/include/net/irda/iriap.h @@ -66,7 +66,7 @@ struct iriap_cb { __u32 daddr; __u8 operation; - struct sk_buff *skb; + struct sk_buff *request_skb; struct lsap_cb *lsap; __u8 slsap_sel; diff --git a/include/net/irda/irlmp_event.h b/include/net/irda/irlmp_event.h index b056e06c29d1..03c6f81a502a 100644 --- a/include/net/irda/irlmp_event.h +++ b/include/net/irda/irlmp_event.h @@ -79,26 +79,6 @@ typedef enum { LM_LAP_IDLE_TIMEOUT, } IRLMP_EVENT; -/* - * Information which is used by the current thread, when executing in the - * state machine. - */ -struct irlmp_event { - IRLMP_EVENT *event; - struct sk_buff *skb; - - __u8 hint; - __u32 daddr; - __u32 saddr; - - __u8 slsap; - __u8 dlsap; - - int reason; - - struct discovery_t *discovery; -}; - extern const char *irlmp_state[]; extern const char *irlsap_state[]; diff --git a/include/net/irda/irport.h b/include/net/irda/irport.h index 79b4d8904346..991f956c096c 100644 --- a/include/net/irda/irport.h +++ b/include/net/irda/irport.h @@ -67,6 +67,7 @@ struct irport_cb { __u32 new_speed; int mode; int index; /* Instance index */ + int transmitting; /* Are we transmitting ? */ spinlock_t lock; /* For serializing operations */ |