Merge git://git.infradead.org/~dwmw2/random-2.6

[pandora-kernel.git] / include / linux / tipc.h

diff --git a/include/linux/tipc.h b/include/linux/tipc.h
index ff109c1..bea4694 100644 (file)
--- a/include/linux/tipc.h
+++ b/include/linux/tipc.h
@@ -1,9 +1,8 @@
 /*
  * include/linux/tipc.h: Include file for TIPC socket interface
  * 
- * Copyright (c) 2003-2005, Ericsson Research Canada
+ * Copyright (c) 2003-2006, Ericsson AB
  * Copyright (c) 2005, Wind River Systems
- * Copyright (c) 2005-2006, Ericsson AB
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -130,6 +129,7 @@ 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 */