diff options
| author | David S. Miller <davem@davemloft.net> | 2011-02-23 20:47:56 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-02-23 20:47:56 -0800 |
| commit | 55ae22d08fc9b531bc8a88b7306004e7053bb425 (patch) | |
| tree | d60dd4970f9bc2fb5ce21571c862d421f4a00402 /include/linux/tipc.h | |
| parent | d12b0d9adc46888e3bb0224886105bf3b188553b (diff) | |
| parent | bf781ecfc6d6ecc4f66762a870f9c1fc76b9c8d5 (diff) | |
Merge branch 'tipc-Feb23-2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/net-next-2.6
Diffstat (limited to 'include/linux/tipc.h')
| -rw-r--r-- | include/linux/tipc.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/include/linux/tipc.h b/include/linux/tipc.h index 1eefa3f6d1f4..a5b994a204d2 100644 --- a/include/linux/tipc.h +++ b/include/linux/tipc.h @@ -2,7 +2,7 @@ * include/linux/tipc.h: Include file for TIPC socket interface * * Copyright (c) 2003-2006, Ericsson AB - * Copyright (c) 2005, Wind River Systems + * Copyright (c) 2005, 2010-2011, Wind River Systems * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -130,12 +130,6 @@ static inline unsigned int tipc_node(__u32 addr) #define TIPC_SUB_PORTS 0x01 /* filter for port availability */ #define TIPC_SUB_SERVICE 0x02 /* filter for service availability */ #define TIPC_SUB_CANCEL 0x04 /* cancel a subscription */ -#if 0 -/* The following filter options are not currently implemented */ -#define TIPC_SUB_NO_BIND_EVTS 0x04 /* filter out "publish" events */ -#define TIPC_SUB_NO_UNBIND_EVTS 0x08 /* filter out "withdraw" events */ -#define TIPC_SUB_SINGLE_EVT 0x10 /* expire after first event */ -#endif #define TIPC_WAIT_FOREVER (~0) /* timeout for permanent subscription */ |