[PATCH] m68k: separate handler for auto and user vector interrupt

[linux-2.6] / net / tipc / name_distr.c

diff --git a/net/tipc/name_distr.c b/net/tipc/name_distr.c
index 830f9099904182daa81dc9e2b76151c81570546e..a3bbc891f95997bf7e186607214aedddc7c1d454 100644 (file)
--- a/net/tipc/name_distr.c
+++ b/net/tipc/name_distr.c
@@ -168,8 +168,8 @@ void tipc_named_withdraw(struct publication *publ)
 void tipc_named_node_up(unsigned long node)
 {
        struct publication *publ;
-       struct distr_item *item = 0;
-       struct sk_buff *buf = 0;
+       struct distr_item *item = NULL;
+       struct sk_buff *buf = NULL;
        u32 left = 0;
        u32 rest;
        u32 max_item_buf;
@@ -200,7 +200,7 @@ void tipc_named_node_up(unsigned long node)
                            "<%u.%u.%u>\n", tipc_zone(node), 
                            tipc_cluster(node), tipc_node(node));
                        tipc_link_send(buf, node, node);
-                       buf = 0;
+                       buf = NULL;
                }
        }
 exit:
@@ -229,8 +229,7 @@ static void node_is_down(struct publication *publ)
                                     publ->node, publ->ref, publ->key);
         assert(p == publ);
        write_unlock_bh(&tipc_nametbl_lock);
-       if (publ)
-               kfree(publ);
+       kfree(publ);
 }
 
 /**