diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2006-01-18 14:23:54 -0800 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-01-18 14:23:54 -0800 |
| commit | 27a7b0415f6e5c0ffdfb1ba42b9b96ddfbb78b8f (patch) | |
| tree | 8107ee11c3fe7d3b4be36054af4475326af86d53 /include | |
| parent | ad12583f46bcb6ce93ccd99fa063c0d701146b2e (diff) | |
| parent | 4323add67792ced172d0d93b8b2e6187023115f1 (diff) | |
| download | blackbird-op-linux-27a7b0415f6e5c0ffdfb1ba42b9b96ddfbb78b8f.tar.gz blackbird-op-linux-27a7b0415f6e5c0ffdfb1ba42b9b96ddfbb78b8f.zip | |
Merge git://tipc.cslab.ericsson.net/pub/git/tipc
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/if_ether.h | 1 | ||||
| -rw-r--r-- | include/linux/tipc_config.h | 7 |
2 files changed, 6 insertions, 2 deletions
diff --git a/include/linux/if_ether.h b/include/linux/if_ether.h index fe26d431de87..7a92c1ce1457 100644 --- a/include/linux/if_ether.h +++ b/include/linux/if_ether.h @@ -72,6 +72,7 @@ * over Ethernet */ #define ETH_P_AOE 0x88A2 /* ATA over Ethernet */ +#define ETH_P_TIPC 0x88CA /* TIPC */ /* * Non DIX types. Won't clash for 1500 types. diff --git a/include/linux/tipc_config.h b/include/linux/tipc_config.h index a52c8c64a5a3..33a653913d94 100644 --- a/include/linux/tipc_config.h +++ b/include/linux/tipc_config.h @@ -168,10 +168,13 @@ #define TIPC_MAX_LINK_NAME 60 /* format = Z.C.N:interface-Z.C.N:interface */ /* - * Link priority limits (range from 0 to # priorities - 1) + * Link priority limits (min, default, max, media default) */ -#define TIPC_NUM_LINK_PRI 32 +#define TIPC_MIN_LINK_PRI 0 +#define TIPC_DEF_LINK_PRI 10 +#define TIPC_MAX_LINK_PRI 31 +#define TIPC_MEDIA_LINK_PRI (TIPC_MAX_LINK_PRI + 1) /* * Link tolerance limits (min, default, max), in ms |
