diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-11-22 13:06:44 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-11-22 13:06:44 -0500 |
| commit | 0bd2af46839ad6262d25714a6ec0365db9d6b98f (patch) | |
| tree | dcced72d230d69fd0c5816ac6dd03ab84799a93e /net/tipc/core.c | |
| parent | e138a5d2356729b8752e88520cc1525fae9794ac (diff) | |
| parent | f26b90440cd74c78fe10c9bd5160809704a9627c (diff) | |
Merge ../scsi-rc-fixes-2.6
Diffstat (limited to 'net/tipc/core.c')
| -rw-r--r-- | net/tipc/core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/tipc/core.c b/net/tipc/core.c index 0539a8362858..6f5b7ee31180 100644 --- a/net/tipc/core.c +++ b/net/tipc/core.c | |||
| @@ -57,7 +57,7 @@ void tipc_socket_stop(void); | |||
| 57 | int tipc_netlink_start(void); | 57 | int tipc_netlink_start(void); |
| 58 | void tipc_netlink_stop(void); | 58 | void tipc_netlink_stop(void); |
| 59 | 59 | ||
| 60 | #define TIPC_MOD_VER "1.6.1" | 60 | #define TIPC_MOD_VER "1.6.2" |
| 61 | 61 | ||
| 62 | #ifndef CONFIG_TIPC_ZONES | 62 | #ifndef CONFIG_TIPC_ZONES |
| 63 | #define CONFIG_TIPC_ZONES 3 | 63 | #define CONFIG_TIPC_ZONES 3 |
| @@ -90,7 +90,7 @@ int tipc_random; | |||
| 90 | atomic_t tipc_user_count = ATOMIC_INIT(0); | 90 | atomic_t tipc_user_count = ATOMIC_INIT(0); |
| 91 | 91 | ||
| 92 | const char tipc_alphabet[] = | 92 | const char tipc_alphabet[] = |
| 93 | "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_"; | 93 | "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_."; |
| 94 | 94 | ||
| 95 | /* configurable TIPC parameters */ | 95 | /* configurable TIPC parameters */ |
| 96 | 96 | ||