Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / net / tipc / bearer.c

diff --git a/net/tipc/bearer.c b/net/tipc/bearer.c
index 9927d1d56c4f1f8e2a015752be33b781c6ea6480..837b7a467885735b3308e612ae07f0c6b3cbafdb 100644 (file)
--- a/net/tipc/bearer.c
+++ b/net/tipc/bearer.c
@@ -36,17 +36,13 @@
 
 #include "core.h"
 #include "config.h"
-#include "dbg.h"
 #include "bearer.h"
-#include "link.h"
-#include "port.h"
 #include "discover.h"
-#include "bcast.h"
 
 #define MAX_ADDR_STR 32
 
 static struct media media_list[MAX_MEDIA];
-static u32 media_count = 0;
+static u32 media_count;
 
 struct bearer tipc_bearers[MAX_BEARERS];
 
@@ -167,7 +163,6 @@ int  tipc_register_media(u32 media_type,
        m_ptr->priority = bearer_priority;
        m_ptr->tolerance = link_tolerance;
        m_ptr->window = send_window_limit;
-       dbg("Media <%s> registered\n", name);
        res = 0;
 exit:
        write_unlock_bh(&tipc_net_lock);
@@ -199,9 +194,8 @@ void tipc_media_addr_printf(struct print_buf *pb, struct tipc_media_addr *a)
                unchar *addr = (unchar *)&a->dev_addr;
 
                tipc_printf(pb, "UNKNOWN(%u)", media_type);
-               for (i = 0; i < (sizeof(*a) - sizeof(a->type)); i++) {
+               for (i = 0; i < (sizeof(*a) - sizeof(a->type)); i++)
                        tipc_printf(pb, "-%02x", addr[i]);
-               }
        }
 }
 
@@ -256,7 +250,8 @@ static int bearer_name_validate(const char *name,
        /* ensure all component parts of bearer name are present */
 
        media_name = name_copy;
-       if ((if_name = strchr(media_name, ':')) == NULL)
+       if_name = strchr(media_name, ':');
+       if (if_name == NULL)
                return 0;
        *(if_name++) = 0;
        media_len = if_name - media_name;
@@ -625,7 +620,7 @@ int tipc_block_bearer(const char *name)
  * Note: This routine assumes caller holds tipc_net_lock.
  */
 
-static int bearer_disable(struct bearer *b_ptr)
+static void bearer_disable(struct bearer *b_ptr)
 {
        struct link *l_ptr;
        struct link *temp_l_ptr;
@@ -641,7 +636,6 @@ static int bearer_disable(struct bearer *b_ptr)
        }
        spin_unlock_bh(&b_ptr->publ.lock);
        memset(b_ptr, 0, sizeof(struct bearer));
-       return 0;
 }
 
 int tipc_disable_bearer(const char *name)
@@ -654,8 +648,10 @@ int tipc_disable_bearer(const char *name)
        if (b_ptr == NULL) {
                warn("Attempt to disable unknown bearer <%s>\n", name);
                res = -EINVAL;
-       } else
-               res = bearer_disable(b_ptr);
+       } else {
+               bearer_disable(b_ptr);
+               res = 0;
+       }
        write_unlock_bh(&tipc_net_lock);
        return res;
 }