tipc: permit overlapping service ranges in name table

[linux-2.6-microblaze.git] / net / tipc / name_table.h

diff --git a/net/tipc/name_table.h b/net/tipc/name_table.h
index 1b03b87..4b14fc2 100644 (file)
--- a/net/tipc/name_table.h
+++ b/net/tipc/name_table.h
@@ -116,16 +116,16 @@ bool tipc_nametbl_lookup(struct net *net, u32 type, u32 instance, u32 domain,
                         struct list_head *dsts, int *dstcnt, u32 exclude,
                         bool all);
 struct publication *tipc_nametbl_publish(struct net *net, u32 type, u32 lower,
-                                        u32 upper, u32 scope, u32 port_ref,
+                                        u32 upper, u32 scope, u32 port,
                                         u32 key);
-int tipc_nametbl_withdraw(struct net *net, u32 type, u32 lower, u32 ref,
+int tipc_nametbl_withdraw(struct net *net, u32 type, u32 lower, u32 upper,
                          u32 key);
 struct publication *tipc_nametbl_insert_publ(struct net *net, u32 type,
                                             u32 lower, u32 upper, u32 scope,
                                             u32 node, u32 ref, u32 key);
 struct publication *tipc_nametbl_remove_publ(struct net *net, u32 type,
-                                            u32 lower, u32 node, u32 ref,
-                                            u32 key);
+                                            u32 lower, u32 upper,
+                                            u32 node, u32 key);
 void tipc_nametbl_subscribe(struct tipc_subscription *s);
 void tipc_nametbl_unsubscribe(struct tipc_subscription *s);
 int tipc_nametbl_init(struct net *net);