diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-01-29 01:41:54 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-01-29 01:41:54 +0000 |
| commit | f969d69ba9f952e5bdd38278e25e26a3e4a61a70 (patch) | |
| tree | b3530d803df59d726afaabebc6626987dee1ca05 /include/net/irda/irda.h | |
| parent | a10ce7ef2066b455d69187643ddf2073bfc4db24 (diff) | |
Merge with 2.3.27.
Diffstat (limited to 'include/net/irda/irda.h')
| -rw-r--r-- | include/net/irda/irda.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/net/irda/irda.h b/include/net/irda/irda.h index 402cc0791..e3af20884 100644 --- a/include/net/irda/irda.h +++ b/include/net/irda/irda.h @@ -6,7 +6,7 @@ * Status: Experimental. * Author: Dag Brattli <dagb@cs.uit.no> * Created at: Tue Dec 9 21:13:12 1997 - * Modified at: Tue Oct 19 21:12:54 1999 + * Modified at: Sun Oct 31 14:45:20 1999 * Modified by: Dag Brattli <dagb@cs.uit.no> * * Copyright (c) 1998-1999 Dag Brattli, All Rights Reserved. @@ -116,7 +116,6 @@ struct irda_sock { __u32 saddr; /* my local address */ __u32 daddr; /* peer address */ - struct ias_object *ias_obj; struct tsap_cb *tsap; /* TSAP used by this connection */ __u8 dtsap_sel; /* remote TSAP address */ __u8 stsap_sel; /* local TSAP address */ @@ -133,6 +132,9 @@ struct irda_sock { __u32 ckey; /* IrLMP client handle */ __u32 skey; /* IrLMP service handle */ + struct ias_object *ias_obj; + struct iriap_cb *iriap; + int nslots; /* Number of slots to use for discovery */ int errno; |