diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2002-06-15 00:05:22 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-06-15 00:05:22 -0700 |
| commit | 39412effc99bdfd977fcd7c98b451b0e129d73b2 (patch) | |
| tree | db524e6436701d74aad3a755130028ce5a9cd15d /include | |
| parent | 079f066ac1f3173136fc9d9e84624fb6e90723e8 (diff) | |
| parent | 260f84a6ecb8b2a4b5ebf7cb3c5264bddfb30706 (diff) | |
Merge http://gkernel.bkbits.net/irda-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/irda.h | 2 | ||||
| -rw-r--r-- | include/net/irda/discovery.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/irda.h b/include/linux/irda.h index 65fa89989607..bdf23baa5483 100644 --- a/include/linux/irda.h +++ b/include/linux/irda.h @@ -68,6 +68,8 @@ typedef enum { IRDA_OLD_BELKIN_DONGLE = 7, IRDA_EP7211_IR = 8, IRDA_MCP2120_DONGLE = 9, + IRDA_ACT200L_DONGLE = 10, + IRDA_MA600_DONGLE = 11, } IRDA_DONGLE; /* Protocol types to be used for SOCK_DGRAM */ diff --git a/include/net/irda/discovery.h b/include/net/irda/discovery.h index 8e22eeab5332..b69dd381ae1e 100644 --- a/include/net/irda/discovery.h +++ b/include/net/irda/discovery.h @@ -36,7 +36,7 @@ #include <net/irda/irda.h> #include <net/irda/irqueue.h> -#define DISCOVERY_EXPIRE_TIMEOUT 6*HZ +#define DISCOVERY_EXPIRE_TIMEOUT (2*sysctl_discovery_timeout*HZ) #define DISCOVERY_DEFAULT_SLOTS 0 /* Types of discovery */ |