Merge branch 'next' into for-linus

1 files changed, 8 insertions, 7 deletions

diff --git a/net/tipc/name_table.c b/net/tipc/name_table.c
index 46e6b6c2ecc9..89eb5621ebba 100644
--- a/net/tipc/name_table.c
+++ b/net/tipc/name_table.c
@@ -251,8 +251,8 @@ static struct publication *tipc_nameseq_insert_publ(struct name_seq *nseq,
                                                     u32 type, u32 lower, u32 upper,
                                                     u32 scope, u32 node, u32 port, u32 key)
 {
-        struct subscription *s;
-        struct subscription *st;
+        struct tipc_subscription *s;
+        struct tipc_subscription *st;
         struct publication *publ;
         struct sub_seq *sseq;
         struct name_info *info;
@@ -381,7 +381,7 @@ static struct publication *tipc_nameseq_remove_publ(struct name_seq *nseq, u32 i
         struct sub_seq *sseq = nameseq_find_subseq(nseq, inst);
         struct name_info *info;
         struct sub_seq *free;
-        struct subscription *s, *st;
+        struct tipc_subscription *s, *st;
         int removed_subseq = 0;
 
         if (!sseq)
@@ -448,7 +448,8 @@ found:
  * sequence overlapping with the requested sequence
  */
 
-static void tipc_nameseq_subscribe(struct name_seq *nseq, struct subscription *s)
+static void tipc_nameseq_subscribe(struct name_seq *nseq,
+                                        struct tipc_subscription *s)
 {
         struct sub_seq *sseq = nseq->sseqs;
 
@@ -625,7 +626,7 @@ not_found:
  */
 
 int tipc_nametbl_mc_translate(u32 type, u32 lower, u32 upper, u32 limit,
-                              struct port_list *dports)
+                              struct tipc_port_list *dports)
 {
         struct name_seq *seq;
         struct sub_seq *sseq;
@@ -739,7 +740,7 @@ int tipc_nametbl_withdraw(u32 type, u32 lower, u32 ref, u32 key)
  * tipc_nametbl_subscribe - add a subscription object to the name table
  */
 
-void tipc_nametbl_subscribe(struct subscription *s)
+void tipc_nametbl_subscribe(struct tipc_subscription *s)
 {
         u32 type = s->seq.type;
         struct name_seq *seq;
@@ -763,7 +764,7 @@ void tipc_nametbl_subscribe(struct subscription *s)
  * tipc_nametbl_unsubscribe - remove a subscription object from name table
  */
 
-void tipc_nametbl_unsubscribe(struct subscription *s)
+void tipc_nametbl_unsubscribe(struct tipc_subscription *s)
 {
         struct name_seq *seq;