6 files changed, 19 insertions, 19 deletions
diff --git a/include/asm-sparc/unistd.h b/include/asm-sparc/unistd.h
index 32a48f623e2b..f5611a721fbd 100644
--- a/include/asm-sparc/unistd.h
+++ b/include/asm-sparc/unistd.h
@@ -41,7 +41,7 @@
 #define __NR_capset              22 /* Linux Specific                              */
 #define __NR_setuid              23 /* Implemented via setreuid in SunOS           */
 #define __NR_getuid              24 /* Common                                      */
-/* #define __NR_time alias       25    ENOSYS under SunOS                          */
+#define __NR_vmsplice            25 /* ENOSYS under SunOS                          */
 #define __NR_ptrace              26 /* Common                                      */
 #define __NR_alarm               27 /* Implemented via setitimer in SunOS          */
 #define __NR_sigaltstack         28 /* Common                                      */
diff --git a/include/asm-sparc64/unistd.h b/include/asm-sparc64/unistd.h
index ca80e8aca128..68705748bec0 100644
--- a/include/asm-sparc64/unistd.h
+++ b/include/asm-sparc64/unistd.h
@@ -41,7 +41,7 @@
 #define __NR_capset              22 /* Linux Specific                              */
 #define __NR_setuid              23 /* Implemented via setreuid in SunOS           */
 #define __NR_getuid              24 /* Common                                      */
-/* #define __NR_time alias       25    ENOSYS under SunOS                          */
+#define __NR_vmsplice            25 /* ENOSYS under SunOS                          */
 #define __NR_ptrace              26 /* Common                                      */
 #define __NR_alarm               27 /* Implemented via setitimer in SunOS          */
 #define __NR_sigaltstack         28 /* Common                                      */
diff --git a/include/linux/netfilter_ipv4/ip_conntrack_helper_h323_asn1.h b/include/linux/netfilter_ipv4/ip_conntrack_helper_h323_asn1.h
index 0bd828081c0c..c6e9a0b6d30b 100644
--- a/include/linux/netfilter_ipv4/ip_conntrack_helper_h323_asn1.h
+++ b/include/linux/netfilter_ipv4/ip_conntrack_helper_h323_asn1.h
@@ -2,7 +2,7 @@
 * ip_conntrack_helper_h323_asn1.h - BER and PER decoding library for H.323
 *                                   conntrack/NAT module.
 *
- * Copyright (c) 2006 by Jing Min Zhao <zhaojingmin@hotmail.com>
+ * Copyright (c) 2006 by Jing Min Zhao <zhaojingmin@users.sourceforge.net>
 *
 * This source code is licensed under General Public License version 2.
 *
diff --git a/include/net/ax25.h b/include/net/ax25.h
index d052b221dbcd..5bd997487054 100644
--- a/include/net/ax25.h
+++ b/include/net/ax25.h
@@ -145,14 +145,14 @@ enum {
 #define AX25_DEF_CONMODE        2                       /* Connected mode allowed */
 #define AX25_DEF_WINDOW         2                       /* Window=2 */
 #define AX25_DEF_EWINDOW        32                      /* Module-128 Window=32 */
-#define AX25_DEF_T1             (10 * HZ)               /* T1=10s */
+#define AX25_DEF_T1             10000                   /* T1=10s */
-#define AX25_DEF_T2             (3 * HZ)                /* T2=3s  */
+#define AX25_DEF_T2             3000                    /* T2=3s  */
-#define AX25_DEF_T3             (300 * HZ)              /* T3=300s */
+#define AX25_DEF_T3             300000                  /* T3=300s */
 #define AX25_DEF_N2             10                      /* N2=10 */
-#define AX25_DEF_IDLE           (0 * 60 * HZ)           /* Idle=None */
+#define AX25_DEF_IDLE           0                       /* Idle=None */
 #define AX25_DEF_PACLEN         256                     /* Paclen=256 */
 #define AX25_DEF_PROTOCOL       AX25_PROTO_STD_SIMPLEX  /* Standard AX.25 */
-#define AX25_DEF_DS_TIMEOUT     (3 * 60 * HZ)           /* DAMA timeout 3 minutes */
+#define AX25_DEF_DS_TIMEOUT     180000                  /* DAMA timeout 3 minutes */
 typedef struct ax25_uid_assoc {
        struct hlist_node       uid_node;
diff --git a/include/net/netrom.h b/include/net/netrom.h
index a5ee53bce62f..e0ca112024a3 100644
--- a/include/net/netrom.h
+++ b/include/net/netrom.h
@@ -42,11 +42,11 @@ enum {
 #define NR_COND_PEER_RX_BUSY            0x04
 #define NR_COND_OWN_RX_BUSY             0x08
-#define NR_DEFAULT_T1                   (120 * HZ)      /* Outstanding frames - 120 seconds */
+#define NR_DEFAULT_T1                   120000          /* Outstanding frames - 120 seconds */
-#define NR_DEFAULT_T2                   (5   * HZ)      /* Response delay     - 5 seconds */
+#define NR_DEFAULT_T2                   5000            /* Response delay     - 5 seconds */
 #define NR_DEFAULT_N2                   3               /* Number of Retries - 3 */
-#define NR_DEFAULT_T4                   (180 * HZ)      /* Busy Delay - 180 seconds */
+#define NR_DEFAULT_T4                   180000          /* Busy Delay - 180 seconds */
-#define NR_DEFAULT_IDLE                 (0 * 60 * HZ)   /* No Activity Timeout - none */
+#define NR_DEFAULT_IDLE                 0               /* No Activity Timeout - none */
 #define NR_DEFAULT_WINDOW               4               /* Default Window Size - 4 */
 #define NR_DEFAULT_OBS                  6               /* Default Obsolescence Count - 6 */
 #define NR_DEFAULT_QUAL                 10              /* Default Neighbour Quality - 10 */
diff --git a/include/net/rose.h b/include/net/rose.h
index 3249b979605a..012b09ed2401 100644
--- a/include/net/rose.h
+++ b/include/net/rose.h
@@ -49,14 +49,14 @@ enum {
        ROSE_STATE_5                    /* Deferred Call Acceptance */
 };
-#define ROSE_DEFAULT_T0                 (180 * HZ)      /* Default T10 T20 value */
+#define ROSE_DEFAULT_T0                 180000          /* Default T10 T20 value */
-#define ROSE_DEFAULT_T1                 (200 * HZ)      /* Default T11 T21 value */
+#define ROSE_DEFAULT_T1                 200000          /* Default T11 T21 value */
-#define ROSE_DEFAULT_T2                 (180 * HZ)      /* Default T12 T22 value */
+#define ROSE_DEFAULT_T2                 180000          /* Default T12 T22 value */
-#define ROSE_DEFAULT_T3                 (180 * HZ)      /* Default T13 T23 value */
+#define ROSE_DEFAULT_T3                 180000          /* Default T13 T23 value */
-#define ROSE_DEFAULT_HB                 (5 * HZ)        /* Default Holdback value */
+#define ROSE_DEFAULT_HB                 5000            /* Default Holdback value */
-#define ROSE_DEFAULT_IDLE               (0 * 60 * HZ)   /* No Activity Timeout - none */
+#define ROSE_DEFAULT_IDLE               0               /* No Activity Timeout - none */
 #define ROSE_DEFAULT_ROUTING            1               /* Default routing flag */
-#define ROSE_DEFAULT_FAIL_TIMEOUT       (120 * HZ)      /* Time until link considered usable */
+#define ROSE_DEFAULT_FAIL_TIMEOUT       120000          /* Time until link considered usable */
 #define ROSE_DEFAULT_MAXVC              50              /* Maximum number of VCs per neighbour */
 #define ROSE_DEFAULT_WINDOW_SIZE        7               /* Default window size */

diff --git a/include/asm-sparc/unistd.h b/include/asm-sparc/unistd.h index 32a48f623e2b..f5611a721fbd 100644 --- a/include/asm-sparc/unistd.h +++ b/include/asm-sparc/unistd.h
@@ -41,7 +41,7 @@
41	#define __NR_capset 22 /* Linux Specific */	41	#define __NR_capset 22 /* Linux Specific */
42	#define __NR_setuid 23 /* Implemented via setreuid in SunOS */	42	#define __NR_setuid 23 /* Implemented via setreuid in SunOS */
43	#define __NR_getuid 24 /* Common */	43	#define __NR_getuid 24 /* Common */
44	/* #define __NR_time alias 25 ENOSYS under SunOS */	44	#define __NR_vmsplice 25 /* ENOSYS under SunOS */
45	#define __NR_ptrace 26 /* Common */	45	#define __NR_ptrace 26 /* Common */
46	#define __NR_alarm 27 /* Implemented via setitimer in SunOS */	46	#define __NR_alarm 27 /* Implemented via setitimer in SunOS */
47	#define __NR_sigaltstack 28 /* Common */	47	#define __NR_sigaltstack 28 /* Common */


diff --git a/include/asm-sparc64/unistd.h b/include/asm-sparc64/unistd.h index ca80e8aca128..68705748bec0 100644 --- a/include/asm-sparc64/unistd.h +++ b/include/asm-sparc64/unistd.h
@@ -41,7 +41,7 @@
41	#define __NR_capset 22 /* Linux Specific */	41	#define __NR_capset 22 /* Linux Specific */
42	#define __NR_setuid 23 /* Implemented via setreuid in SunOS */	42	#define __NR_setuid 23 /* Implemented via setreuid in SunOS */
43	#define __NR_getuid 24 /* Common */	43	#define __NR_getuid 24 /* Common */
44	/* #define __NR_time alias 25 ENOSYS under SunOS */	44	#define __NR_vmsplice 25 /* ENOSYS under SunOS */
45	#define __NR_ptrace 26 /* Common */	45	#define __NR_ptrace 26 /* Common */
46	#define __NR_alarm 27 /* Implemented via setitimer in SunOS */	46	#define __NR_alarm 27 /* Implemented via setitimer in SunOS */
47	#define __NR_sigaltstack 28 /* Common */	47	#define __NR_sigaltstack 28 /* Common */


diff --git a/include/linux/netfilter_ipv4/ip_conntrack_helper_h323_asn1.h b/include/linux/netfilter_ipv4/ip_conntrack_helper_h323_asn1.h index 0bd828081c0c..c6e9a0b6d30b 100644 --- a/include/linux/netfilter_ipv4/ip_conntrack_helper_h323_asn1.h +++ b/include/linux/netfilter_ipv4/ip_conntrack_helper_h323_asn1.h
@@ -2,7 +2,7 @@
2	* ip_conntrack_helper_h323_asn1.h - BER and PER decoding library for H.323	2	* ip_conntrack_helper_h323_asn1.h - BER and PER decoding library for H.323
3	* conntrack/NAT module.	3	* conntrack/NAT module.
4	*	4	*
5	* Copyright (c) 2006 by Jing Min Zhao <zhaojingmin@hotmail.com>	5	* Copyright (c) 2006 by Jing Min Zhao <zhaojingmin@users.sourceforge.net>
6	*	6	*
7	* This source code is licensed under General Public License version 2.	7	* This source code is licensed under General Public License version 2.
8	*	8	*


diff --git a/include/net/ax25.h b/include/net/ax25.h index d052b221dbcd..5bd997487054 100644 --- a/include/net/ax25.h +++ b/include/net/ax25.h
@@ -145,14 +145,14 @@ enum {
145	#define AX25_DEF_CONMODE 2 /* Connected mode allowed */	145	#define AX25_DEF_CONMODE 2 /* Connected mode allowed */
146	#define AX25_DEF_WINDOW 2 /* Window=2 */	146	#define AX25_DEF_WINDOW 2 /* Window=2 */
147	#define AX25_DEF_EWINDOW 32 /* Module-128 Window=32 */	147	#define AX25_DEF_EWINDOW 32 /* Module-128 Window=32 */
148	#define AX25_DEF_T1 (10 * HZ) /* T1=10s */	148	#define AX25_DEF_T1 10000 /* T1=10s */
149	#define AX25_DEF_T2 (3 * HZ) /* T2=3s */	149	#define AX25_DEF_T2 3000 /* T2=3s */
150	#define AX25_DEF_T3 (300 * HZ) /* T3=300s */	150	#define AX25_DEF_T3 300000 /* T3=300s */
151	#define AX25_DEF_N2 10 /* N2=10 */	151	#define AX25_DEF_N2 10 /* N2=10 */
152	#define AX25_DEF_IDLE (0 * 60 * HZ) /* Idle=None */	152	#define AX25_DEF_IDLE 0 /* Idle=None */
153	#define AX25_DEF_PACLEN 256 /* Paclen=256 */	153	#define AX25_DEF_PACLEN 256 /* Paclen=256 */
154	#define AX25_DEF_PROTOCOL AX25_PROTO_STD_SIMPLEX /* Standard AX.25 */	154	#define AX25_DEF_PROTOCOL AX25_PROTO_STD_SIMPLEX /* Standard AX.25 */
155	#define AX25_DEF_DS_TIMEOUT (3 * 60 * HZ) /* DAMA timeout 3 minutes */	155	#define AX25_DEF_DS_TIMEOUT 180000 /* DAMA timeout 3 minutes */
156		156
157	typedef struct ax25_uid_assoc {	157	typedef struct ax25_uid_assoc {
158	struct hlist_node uid_node;	158	struct hlist_node uid_node;


diff --git a/include/net/netrom.h b/include/net/netrom.h index a5ee53bce62f..e0ca112024a3 100644 --- a/include/net/netrom.h +++ b/include/net/netrom.h
@@ -42,11 +42,11 @@ enum {
42	#define NR_COND_PEER_RX_BUSY 0x04	42	#define NR_COND_PEER_RX_BUSY 0x04
43	#define NR_COND_OWN_RX_BUSY 0x08	43	#define NR_COND_OWN_RX_BUSY 0x08
44		44
45	#define NR_DEFAULT_T1 (120 * HZ) /* Outstanding frames - 120 seconds */	45	#define NR_DEFAULT_T1 120000 /* Outstanding frames - 120 seconds */
46	#define NR_DEFAULT_T2 (5 * HZ) /* Response delay - 5 seconds */	46	#define NR_DEFAULT_T2 5000 /* Response delay - 5 seconds */
47	#define NR_DEFAULT_N2 3 /* Number of Retries - 3 */	47	#define NR_DEFAULT_N2 3 /* Number of Retries - 3 */
48	#define NR_DEFAULT_T4 (180 * HZ) /* Busy Delay - 180 seconds */	48	#define NR_DEFAULT_T4 180000 /* Busy Delay - 180 seconds */
49	#define NR_DEFAULT_IDLE (0 * 60 * HZ) /* No Activity Timeout - none */	49	#define NR_DEFAULT_IDLE 0 /* No Activity Timeout - none */
50	#define NR_DEFAULT_WINDOW 4 /* Default Window Size - 4 */	50	#define NR_DEFAULT_WINDOW 4 /* Default Window Size - 4 */
51	#define NR_DEFAULT_OBS 6 /* Default Obsolescence Count - 6 */	51	#define NR_DEFAULT_OBS 6 /* Default Obsolescence Count - 6 */
52	#define NR_DEFAULT_QUAL 10 /* Default Neighbour Quality - 10 */	52	#define NR_DEFAULT_QUAL 10 /* Default Neighbour Quality - 10 */


diff --git a/include/net/rose.h b/include/net/rose.h index 3249b979605a..012b09ed2401 100644 --- a/include/net/rose.h +++ b/include/net/rose.h
@@ -49,14 +49,14 @@ enum {
49	ROSE_STATE_5 /* Deferred Call Acceptance */	49	ROSE_STATE_5 /* Deferred Call Acceptance */
50	};	50	};
51		51
52	#define ROSE_DEFAULT_T0 (180 * HZ) /* Default T10 T20 value */	52	#define ROSE_DEFAULT_T0 180000 /* Default T10 T20 value */
53	#define ROSE_DEFAULT_T1 (200 * HZ) /* Default T11 T21 value */	53	#define ROSE_DEFAULT_T1 200000 /* Default T11 T21 value */
54	#define ROSE_DEFAULT_T2 (180 * HZ) /* Default T12 T22 value */	54	#define ROSE_DEFAULT_T2 180000 /* Default T12 T22 value */
55	#define ROSE_DEFAULT_T3 (180 * HZ) /* Default T13 T23 value */	55	#define ROSE_DEFAULT_T3 180000 /* Default T13 T23 value */
56	#define ROSE_DEFAULT_HB (5 * HZ) /* Default Holdback value */	56	#define ROSE_DEFAULT_HB 5000 /* Default Holdback value */
57	#define ROSE_DEFAULT_IDLE (0 * 60 * HZ) /* No Activity Timeout - none */	57	#define ROSE_DEFAULT_IDLE 0 /* No Activity Timeout - none */
58	#define ROSE_DEFAULT_ROUTING 1 /* Default routing flag */	58	#define ROSE_DEFAULT_ROUTING 1 /* Default routing flag */
59	#define ROSE_DEFAULT_FAIL_TIMEOUT (120 * HZ) /* Time until link considered usable */	59	#define ROSE_DEFAULT_FAIL_TIMEOUT 120000 /* Time until link considered usable */
60	#define ROSE_DEFAULT_MAXVC 50 /* Maximum number of VCs per neighbour */	60	#define ROSE_DEFAULT_MAXVC 50 /* Maximum number of VCs per neighbour */
61	#define ROSE_DEFAULT_WINDOW_SIZE 7 /* Default window size */	61	#define ROSE_DEFAULT_WINDOW_SIZE 7 /* Default window size */
62		62