diff options
| author | David S. Miller <davem@davemloft.net> | 2011-03-13 18:49:11 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-13 18:49:11 -0700 |
| commit | 27b61ae2d73936554fcd07e77c3cc13bc88c41a9 (patch) | |
| tree | 12f589c6a4671bf7f08045bb11059514f47bb924 /include/linux/tipc_config.h | |
| parent | 46af31800b6916c92fffa529dc3c357008da957d (diff) | |
| parent | 633d2bdedc3b81f202bda8fdad17aeb08809b7df (diff) | |
| download | kernel_samsung_smdk4412-27b61ae2d73936554fcd07e77c3cc13bc88c41a9.zip kernel_samsung_smdk4412-27b61ae2d73936554fcd07e77c3cc13bc88c41a9.tar.gz kernel_samsung_smdk4412-27b61ae2d73936554fcd07e77c3cc13bc88c41a9.tar.bz2 | |
Merge branch 'tipc-Mar13-2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/net-next-2.6
Diffstat (limited to 'include/linux/tipc_config.h')
| -rw-r--r-- | include/linux/tipc_config.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/tipc_config.h b/include/linux/tipc_config.h index 011556f..0db2395 100644 --- a/include/linux/tipc_config.h +++ b/include/linux/tipc_config.h @@ -89,7 +89,7 @@ #define TIPC_CMD_GET_MAX_SUBSCR 0x4006 /* tx none, rx unsigned */ #define TIPC_CMD_GET_MAX_ZONES 0x4007 /* obsoleted */ #define TIPC_CMD_GET_MAX_CLUSTERS 0x4008 /* obsoleted */ -#define TIPC_CMD_GET_MAX_NODES 0x4009 /* tx none, rx unsigned */ +#define TIPC_CMD_GET_MAX_NODES 0x4009 /* obsoleted */ #define TIPC_CMD_GET_MAX_SLAVES 0x400A /* obsoleted */ #define TIPC_CMD_GET_NETID 0x400B /* tx none, rx unsigned */ @@ -115,7 +115,7 @@ #define TIPC_CMD_SET_MAX_SUBSCR 0x8006 /* tx unsigned, rx none */ #define TIPC_CMD_SET_MAX_ZONES 0x8007 /* obsoleted */ #define TIPC_CMD_SET_MAX_CLUSTERS 0x8008 /* obsoleted */ -#define TIPC_CMD_SET_MAX_NODES 0x8009 /* tx unsigned, rx none */ +#define TIPC_CMD_SET_MAX_NODES 0x8009 /* obsoleted */ #define TIPC_CMD_SET_MAX_SLAVES 0x800A /* obsoleted */ #define TIPC_CMD_SET_NETID 0x800B /* tx unsigned, rx none */ @@ -202,7 +202,7 @@ struct tipc_link_info { struct tipc_bearer_config { __be32 priority; /* Range [1,31]. Override per link */ - __be32 detect_scope; + __be32 disc_domain; /* <Z.C.N> describing desired nodes */ char name[TIPC_MAX_BEARER_NAME]; }; |