projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] sched_domain: handle kmalloc failure
[powerpc.git]
/
include
/
net
/
ax25.h
diff --git
a/include/net/ax25.h
b/include/net/ax25.h
index
2250a18
..
7cd528e
100644
(file)
--- a/
include/net/ax25.h
+++ b/
include/net/ax25.h
@@
-6,7
+6,6
@@
#ifndef _AX25_H
#define _AX25_H
#ifndef _AX25_H
#define _AX25_H
-#include <linux/config.h>
#include <linux/ax25.h>
#include <linux/spinlock.h>
#include <linux/timer.h>
#include <linux/ax25.h>
#include <linux/spinlock.h>
#include <linux/timer.h>
@@
-110,8
+109,15
@@
enum {
enum {
AX25_PROTO_STD_SIMPLEX,
AX25_PROTO_STD_DUPLEX,
enum {
AX25_PROTO_STD_SIMPLEX,
AX25_PROTO_STD_DUPLEX,
+#ifdef CONFIG_AX25_DAMA_SLAVE
AX25_PROTO_DAMA_SLAVE,
AX25_PROTO_DAMA_SLAVE,
- AX25_PROTO_DAMA_MASTER
+#ifdef CONFIG_AX25_DAMA_MASTER
+ AX25_PROTO_DAMA_MASTER,
+#define AX25_PROTO_MAX AX25_PROTO_DAMA_MASTER
+#endif
+#endif
+ __AX25_PROTO_MAX,
+ AX25_PROTO_MAX = __AX25_PROTO_MAX -1
};
enum {
};
enum {
@@
-138,14
+144,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_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_T2
(3 * HZ)
/* T2=3s */
-#define AX25_DEF_T3
(300 * HZ)
/* T3=300s */
+#define AX25_DEF_T1
10000
/* T1=10s */
+#define AX25_DEF_T2
3000
/* T2=3s */
+#define AX25_DEF_T3
300000
/* T3=300s */
#define AX25_DEF_N2 10 /* N2=10 */
#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_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;
typedef struct ax25_uid_assoc {
struct hlist_node uid_node;