linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git] / net / tipc / link.c
index 693f02e..511872a 100644 (file)
@@ -2,7 +2,7 @@
  * net/tipc/link.c: TIPC link code
  * 
  * Copyright (c) 1996-2006, Ericsson AB
- * Copyright (c) 2004-2006, Wind River Systems
+ * Copyright (c) 2004-2005, Wind River Systems
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -157,13 +157,13 @@ static void link_print(struct link *l_ptr, struct print_buf *buf,
        } \
 } while (0)
 
-static void dbg_print_link(struct link *l_ptr, const char *str)
+static inline void dbg_print_link(struct link *l_ptr, const char *str)
 {
        if (DBG_OUTPUT)
                link_print(l_ptr, DBG_OUTPUT, str);
 }
 
-static void dbg_print_buf_chain(struct sk_buff *root_buf)
+static inline void dbg_print_buf_chain(struct sk_buff *root_buf)
 {
        if (DBG_OUTPUT) {
                struct sk_buff *buf = root_buf;
@@ -176,50 +176,50 @@ static void dbg_print_buf_chain(struct sk_buff *root_buf)
 }
 
 /*
- *  Simple link routines
+ *  Simple inlined link routines
  */
 
-static unsigned int align(unsigned int i)
+static inline unsigned int align(unsigned int i)
 {
        return (i + 3) & ~3u;
 }
 
-static int link_working_working(struct link *l_ptr)
+static inline int link_working_working(struct link *l_ptr)
 {
        return (l_ptr->state == WORKING_WORKING);
 }
 
-static int link_working_unknown(struct link *l_ptr)
+static inline int link_working_unknown(struct link *l_ptr)
 {
        return (l_ptr->state == WORKING_UNKNOWN);
 }
 
-static int link_reset_unknown(struct link *l_ptr)
+static inline int link_reset_unknown(struct link *l_ptr)
 {
        return (l_ptr->state == RESET_UNKNOWN);
 }
 
-static int link_reset_reset(struct link *l_ptr)
+static inline int link_reset_reset(struct link *l_ptr)
 {
        return (l_ptr->state == RESET_RESET);
 }
 
-static int link_blocked(struct link *l_ptr)
+static inline int link_blocked(struct link *l_ptr)
 {
        return (l_ptr->exp_msg_count || l_ptr->blocked);
 }
 
-static int link_congested(struct link *l_ptr)
+static inline int link_congested(struct link *l_ptr)
 {
        return (l_ptr->out_queue_size >= l_ptr->queue_limit[0]);
 }
 
-static u32 link_max_pkt(struct link *l_ptr)
+static inline u32 link_max_pkt(struct link *l_ptr)
 {
        return l_ptr->max_pkt;
 }
 
-static void link_init_max_pkt(struct link *l_ptr)
+static inline void link_init_max_pkt(struct link *l_ptr)
 {
        u32 max_pkt;
        
@@ -236,20 +236,20 @@ static void link_init_max_pkt(struct link *l_ptr)
         l_ptr->max_pkt_probes = 0;
 }
 
-static u32 link_next_sent(struct link *l_ptr)
+static inline u32 link_next_sent(struct link *l_ptr)
 {
        if (l_ptr->next_out)
                return msg_seqno(buf_msg(l_ptr->next_out));
        return mod(l_ptr->next_out_no);
 }
 
-static u32 link_last_sent(struct link *l_ptr)
+static inline u32 link_last_sent(struct link *l_ptr)
 {
        return mod(link_next_sent(l_ptr) - 1);
 }
 
 /*
- *  Simple non-static link routines (i.e. referenced outside this file)
+ *  Simple non-inlined link routines (i.e. referenced outside this file)
  */
 
 int tipc_link_is_up(struct link *l_ptr)
@@ -396,7 +396,7 @@ static void link_timeout(struct link *l_ptr)
        tipc_node_unlock(l_ptr->owner);
 }
 
-static void link_set_timer(struct link *l_ptr, u32 time)
+static inline void link_set_timer(struct link *l_ptr, u32 time)
 {
        k_start_timer(&l_ptr->timer, time);
 }
@@ -417,11 +417,12 @@ struct link *tipc_link_create(struct bearer *b_ptr, const u32 peer,
        struct tipc_msg *msg;
        char *if_name;
 
-       l_ptr = kzalloc(sizeof(*l_ptr), GFP_ATOMIC);
+       l_ptr = (struct link *)kmalloc(sizeof(*l_ptr), GFP_ATOMIC);
        if (!l_ptr) {
-               warn("Link creation failed, no memory\n");
+               warn("Memory squeeze; Failed to create link\n");
                return NULL;
        }
+       memset(l_ptr, 0, sizeof(*l_ptr));
 
        l_ptr->addr = peer;
        if_name = strchr(b_ptr->publ.name, ':') + 1;
@@ -468,7 +469,7 @@ struct link *tipc_link_create(struct bearer *b_ptr, const u32 peer,
 
                if (!pb) {
                        kfree(l_ptr);
-                       warn("Link creation failed, no memory for print buffer\n");
+                       warn("Memory squeeze; Failed to create link\n");
                        return NULL;
                }
                tipc_printbuf_init(&l_ptr->print_buf, pb, LINK_LOG_BUF_SIZE);
@@ -572,7 +573,8 @@ void tipc_link_wakeup_ports(struct link *l_ptr, int all)
                if (win <= 0)
                        break;
                list_del_init(&p_ptr->wait_list);
-               p_ptr->congested_link = NULL;
+               p_ptr->congested_link = 0;
+               assert(p_ptr->wakeup);
                spin_lock_bh(p_ptr->publ.lock);
                p_ptr->publ.congested = 0;
                p_ptr->wakeup(&p_ptr->publ);
@@ -689,7 +691,6 @@ void tipc_link_reset(struct link *l_ptr)
        struct sk_buff *buf;
        u32 prev_state = l_ptr->state;
        u32 checkpoint = l_ptr->next_in_no;
-       int was_active_link = tipc_link_is_active(l_ptr);
        
        msg_set_session(l_ptr->pmsg, msg_session(l_ptr->pmsg) + 1);
 
@@ -711,7 +712,7 @@ void tipc_link_reset(struct link *l_ptr)
        tipc_printf(TIPC_CONS, "\nReset link <%s>\n", l_ptr->name);
        dbg_link_dump();
 #endif
-       if (was_active_link && tipc_node_has_active_links(l_ptr->owner) &&
+       if (tipc_node_has_active_links(l_ptr->owner) &&
            l_ptr->owner->permit_changeover) {
                l_ptr->reset_checkpoint = checkpoint;
                l_ptr->exp_msg_count = START_CHANGEOVER;
@@ -754,7 +755,7 @@ void tipc_link_reset(struct link *l_ptr)
 
 static void link_activate(struct link *l_ptr)
 {
-       l_ptr->next_in_no = l_ptr->stats.recv_info = 1;
+       l_ptr->next_in_no = 1;
        tipc_node_link_up(l_ptr->owner, l_ptr);
        tipc_bearer_add_dest(l_ptr->b_ptr, l_ptr->addr);
        link_send_event(tipc_cfg_link_event, l_ptr, 1);
@@ -819,8 +820,6 @@ static void link_state_event(struct link *l_ptr, unsigned event)
                        break;
                case RESET_MSG:
                        dbg_link("RES -> RR\n");
-                       info("Resetting link <%s>, requested by peer\n", 
-                            l_ptr->name);
                        tipc_link_reset(l_ptr);
                        l_ptr->state = RESET_RESET;
                        l_ptr->fsm_msg_cnt = 0;
@@ -845,8 +844,6 @@ static void link_state_event(struct link *l_ptr, unsigned event)
                        break;
                case RESET_MSG:
                        dbg_link("RES -> RR\n");
-                       info("Resetting link <%s>, requested by peer "
-                            "while probing\n", l_ptr->name);
                        tipc_link_reset(l_ptr);
                        l_ptr->state = RESET_RESET;
                        l_ptr->fsm_msg_cnt = 0;
@@ -878,8 +875,6 @@ static void link_state_event(struct link *l_ptr, unsigned event)
                        } else {        /* Link has failed */
                                dbg_link("-> RU (%u probes unanswered)\n",
                                         l_ptr->fsm_msg_cnt);
-                               warn("Resetting link <%s>, peer not responding\n",
-                                    l_ptr->name);
                                tipc_link_reset(l_ptr);
                                l_ptr->state = RESET_UNKNOWN;
                                l_ptr->fsm_msg_cnt = 0;
@@ -987,20 +982,17 @@ static int link_bundle_buf(struct link *l_ptr,
        struct tipc_msg *bundler_msg = buf_msg(bundler);
        struct tipc_msg *msg = buf_msg(buf);
        u32 size = msg_size(msg);
-       u32 bundle_size = msg_size(bundler_msg);
-       u32 to_pos = align(bundle_size);
-       u32 pad = to_pos - bundle_size;
+       u32 to_pos = align(msg_size(bundler_msg));
+       u32 rest = link_max_pkt(l_ptr) - to_pos;
 
        if (msg_user(bundler_msg) != MSG_BUNDLER)
                return 0;
        if (msg_type(bundler_msg) != OPEN_MSG)
                return 0;
-       if (skb_tailroom(bundler) < (pad + size))
-               return 0;
-       if (link_max_pkt(l_ptr) < (to_pos + size))
+       if (rest < align(size))
                return 0;
 
-       skb_put(bundler, pad + size);
+       skb_put(bundler, (to_pos - msg_size(bundler_msg)) + size);
        memcpy(bundler->data + to_pos, buf->data, size);
        msg_set_size(bundler_msg, to_pos + size);
        msg_set_msgcnt(bundler_msg, msg_msgcnt(bundler_msg) + 1);
@@ -1012,9 +1004,9 @@ static int link_bundle_buf(struct link *l_ptr,
        return 1;
 }
 
-static void link_add_to_outqueue(struct link *l_ptr,
-                                struct sk_buff *buf,
-                                struct tipc_msg *msg)
+static inline void link_add_to_outqueue(struct link *l_ptr, 
+                                       struct sk_buff *buf, 
+                                       struct tipc_msg *msg)
 {
        u32 ack = mod(l_ptr->next_in_no - 1);
        u32 seqno = mod(l_ptr->next_out_no++);
@@ -1058,7 +1050,7 @@ int tipc_link_send_buf(struct link *l_ptr, struct sk_buff *buf)
                msg_dbg(msg, "TIPC: Congestion, throwing away\n");
                buf_discard(buf);
                if (imp > CONN_MANAGER) {
-                       warn("Resetting link <%s>, send queue full", l_ptr->name);
+                       warn("Resetting <%s>, send queue full", l_ptr->name);
                        tipc_link_reset(l_ptr);
                }
                return dsz;
@@ -1143,13 +1135,9 @@ int tipc_link_send(struct sk_buff *buf, u32 dest, u32 selector)
        if (n_ptr) {
                tipc_node_lock(n_ptr);
                l_ptr = n_ptr->active_links[selector & 1];
+               dbg("tipc_link_send: found link %x for dest %x\n", l_ptr, dest);
                if (l_ptr) {
-                       dbg("tipc_link_send: found link %x for dest %x\n", l_ptr, dest);
                        res = tipc_link_send_buf(l_ptr, buf);
-               } else {
-                       dbg("Attempt to send msg to unreachable node:\n");
-                       msg_dbg(buf_msg(buf),">>>");
-                       buf_discard(buf);
                }
                tipc_node_unlock(n_ptr);
        } else {
@@ -1168,8 +1156,8 @@ int tipc_link_send(struct sk_buff *buf, u32 dest, u32 selector)
  * Link is locked. Returns user data length.
  */
 
-static int link_send_buf_fast(struct link *l_ptr, struct sk_buff *buf,
-                             u32 *used_max_pkt)
+static inline int link_send_buf_fast(struct link *l_ptr, struct sk_buff *buf,
+                                    u32 *used_max_pkt)
 {
        struct tipc_msg *msg = buf_msg(buf);
        int res = msg_data_sz(msg);
@@ -1254,6 +1242,8 @@ int tipc_link_send_sections_fast(struct port *sender,
        int res;
        u32 selector = msg_origport(hdr) & 1;
 
+       assert(destaddr != tipc_own_addr);
+
 again:
        /*
         * Try building message using port's max_pkt hint.
@@ -1365,7 +1355,7 @@ again:
        fragm_crs = 0;
        fragm_rest = 0;
        sect_rest = 0;
-       sect_crs = NULL;
+       sect_crs = 0;
        curr_sect = -1;
 
        /* Prepare reusable fragment header: */
@@ -1559,7 +1549,7 @@ u32 tipc_link_push_packet(struct link *l_ptr)
                        msg_dbg(buf_msg(buf), ">DEF-PROT>");
                        l_ptr->unacked_window = 0;
                        buf_discard(buf);
-                       l_ptr->proto_msg_queue = NULL;
+                       l_ptr->proto_msg_queue = 0;
                        return TIPC_OK;
                } else {
                        msg_dbg(buf_msg(buf), "|>DEF-PROT>");
@@ -1614,121 +1604,40 @@ void tipc_link_push_queue(struct link *l_ptr)
                tipc_bearer_schedule(l_ptr->b_ptr, l_ptr);
 }
 
-static void link_reset_all(unsigned long addr)
-{
-       struct node *n_ptr;
-       char addr_string[16];
-       u32 i;
-
-       read_lock_bh(&tipc_net_lock);
-       n_ptr = tipc_node_find((u32)addr);
-       if (!n_ptr) {
-               read_unlock_bh(&tipc_net_lock);
-               return; /* node no longer exists */
-       }
-
-       tipc_node_lock(n_ptr);
-
-       warn("Resetting all links to %s\n", 
-            addr_string_fill(addr_string, n_ptr->addr));
-
-       for (i = 0; i < MAX_BEARERS; i++) {
-               if (n_ptr->links[i]) {
-                       link_print(n_ptr->links[i], TIPC_OUTPUT, 
-                                  "Resetting link\n");
-                       tipc_link_reset(n_ptr->links[i]);
-               }
-       }
-
-       tipc_node_unlock(n_ptr);
-       read_unlock_bh(&tipc_net_lock);
-}
-
-static void link_retransmit_failure(struct link *l_ptr, struct sk_buff *buf)
-{
-       struct tipc_msg *msg = buf_msg(buf);
-
-       warn("Retransmission failure on link <%s>\n", l_ptr->name);
-       tipc_msg_print(TIPC_OUTPUT, msg, ">RETR-FAIL>");
-
-       if (l_ptr->addr) {
-
-               /* Handle failure on standard link */
-
-               link_print(l_ptr, TIPC_OUTPUT, "Resetting link\n");
-               tipc_link_reset(l_ptr);
-
-       } else {
-
-               /* Handle failure on broadcast link */
-
-               struct node *n_ptr;
-               char addr_string[16];
-
-               tipc_printf(TIPC_OUTPUT, "Msg seq number: %u,  ", msg_seqno(msg));
-               tipc_printf(TIPC_OUTPUT, "Outstanding acks: %u\n", (u32)TIPC_SKB_CB(buf)->handle);
-               
-               n_ptr = l_ptr->owner->next;
-               tipc_node_lock(n_ptr);
-
-               addr_string_fill(addr_string, n_ptr->addr);
-               tipc_printf(TIPC_OUTPUT, "Multicast link info for %s\n", addr_string);
-               tipc_printf(TIPC_OUTPUT, "Supported: %d,  ", n_ptr->bclink.supported);
-               tipc_printf(TIPC_OUTPUT, "Acked: %u\n", n_ptr->bclink.acked);
-               tipc_printf(TIPC_OUTPUT, "Last in: %u,  ", n_ptr->bclink.last_in);
-               tipc_printf(TIPC_OUTPUT, "Gap after: %u,  ", n_ptr->bclink.gap_after);
-               tipc_printf(TIPC_OUTPUT, "Gap to: %u\n", n_ptr->bclink.gap_to);
-               tipc_printf(TIPC_OUTPUT, "Nack sync: %u\n\n", n_ptr->bclink.nack_sync);
-
-               tipc_k_signal((Handler)link_reset_all, (unsigned long)n_ptr->addr);
-
-               tipc_node_unlock(n_ptr);
-
-               l_ptr->stale_count = 0;
-       }
-}
-
 void tipc_link_retransmit(struct link *l_ptr, struct sk_buff *buf, 
                          u32 retransmits)
 {
        struct tipc_msg *msg;
 
-       if (!buf)
-               return;
-
-       msg = buf_msg(buf);
-       
        dbg("Retransmitting %u in link %x\n", retransmits, l_ptr);
 
-       if (tipc_bearer_congested(l_ptr->b_ptr, l_ptr)) {
-               if (!skb_cloned(buf)) {
-                       msg_dbg(msg, ">NO_RETR->BCONG>");
-                       dbg_print_link(l_ptr, "   ");
-                       l_ptr->retransm_queue_head = msg_seqno(msg);
-                       l_ptr->retransm_queue_size = retransmits;
-                       return;
-               } else {
-                       /* Don't retransmit if driver already has the buffer */
-               }
-       } else {
-               /* Detect repeated retransmit failures on uncongested bearer */
-
-               if (l_ptr->last_retransmitted == msg_seqno(msg)) {
-                       if (++l_ptr->stale_count > 100) {
-                               link_retransmit_failure(l_ptr, buf);
-                               return;
-                       }
-               } else {
-                       l_ptr->last_retransmitted = msg_seqno(msg);
-                       l_ptr->stale_count = 1;
-               }
+       if (tipc_bearer_congested(l_ptr->b_ptr, l_ptr) && buf && !skb_cloned(buf)) {
+               msg_dbg(buf_msg(buf), ">NO_RETR->BCONG>");
+               dbg_print_link(l_ptr, "   ");
+               l_ptr->retransm_queue_head = msg_seqno(buf_msg(buf));
+               l_ptr->retransm_queue_size = retransmits;
+               return;
        }
-
        while (retransmits && (buf != l_ptr->next_out) && buf && !skb_cloned(buf)) {
                msg = buf_msg(buf);
                msg_set_ack(msg, mod(l_ptr->next_in_no - 1));
                msg_set_bcast_ack(msg, l_ptr->owner->bclink.last_in); 
                if (tipc_bearer_send(l_ptr->b_ptr, buf, &l_ptr->media_addr)) {
+                        /* Catch if retransmissions fail repeatedly: */
+                        if (l_ptr->last_retransmitted == msg_seqno(msg)) {
+                                if (++l_ptr->stale_count > 100) {
+                                        tipc_msg_print(TIPC_CONS, buf_msg(buf), ">RETR>");
+                                        info("...Retransmitted %u times\n",
+                                            l_ptr->stale_count);
+                                        link_print(l_ptr, TIPC_CONS, "Resetting Link\n");;
+                                        tipc_link_reset(l_ptr);
+                                        break;
+                                }
+                        } else {
+                                l_ptr->stale_count = 0;
+                        }
+                        l_ptr->last_retransmitted = msg_seqno(msg);
+
                        msg_dbg(buf_msg(buf), ">RETR>");
                        buf = buf->next;
                        retransmits--;
@@ -1741,7 +1650,6 @@ void tipc_link_retransmit(struct link *l_ptr, struct sk_buff *buf,
                        return;
                }
        }
-
        l_ptr->retransm_queue_head = l_ptr->retransm_queue_size = 0;
 }
 
@@ -1812,11 +1720,6 @@ void tipc_recv_msg(struct sk_buff *head, struct tipc_bearer *tb_ptr)
                        link_recv_non_seq(buf);
                        continue;
                }
-               
-               if (unlikely(!msg_short(msg) &&
-                            (msg_destnode(msg) != tipc_own_addr)))
-                       goto cont;
-               
                n_ptr = tipc_node_find(msg_prevnode(msg));
                if (unlikely(!n_ptr))
                        goto cont;
@@ -1957,7 +1860,7 @@ u32 tipc_link_defer_pkt(struct sk_buff **head,
                        struct sk_buff **tail,
                        struct sk_buff *buf)
 {
-       struct sk_buff *prev = NULL;
+       struct sk_buff *prev = 0;
        struct sk_buff *crs = *head;
        u32 seq_no = msg_seqno(buf_msg(buf));
 
@@ -2050,7 +1953,7 @@ static void link_handle_out_of_seq_msg(struct link *l_ptr,
 void tipc_link_send_proto_msg(struct link *l_ptr, u32 msg_typ, int probe_msg,
                              u32 gap, u32 tolerance, u32 priority, u32 ack_mtu)
 {
-       struct sk_buff *buf = NULL;
+       struct sk_buff *buf = 0;
        struct tipc_msg *msg = l_ptr->pmsg;
         u32 msg_size = sizeof(l_ptr->proto_msg);
 
@@ -2237,7 +2140,7 @@ static void link_recv_proto_msg(struct link *l_ptr, struct sk_buff *buf)
                
                if (msg_linkprio(msg) && 
                    (msg_linkprio(msg) != l_ptr->priority)) {
-                       warn("Resetting link <%s>, priority change %u->%u\n",
+                       warn("Changing prio <%s>: %u->%u\n",
                             l_ptr->name, l_ptr->priority, msg_linkprio(msg));
                        l_ptr->priority = msg_linkprio(msg);
                        tipc_link_reset(l_ptr); /* Enforce change to take effect */
@@ -2306,22 +2209,17 @@ void tipc_link_tunnel(struct link *l_ptr,
        u32 length = msg_size(msg);
 
        tunnel = l_ptr->owner->active_links[selector & 1];
-       if (!tipc_link_is_up(tunnel)) {
-               warn("Link changeover error, "
-                    "tunnel link no longer available\n");
+       if (!tipc_link_is_up(tunnel))
                return;
-       }
        msg_set_size(tunnel_hdr, length + INT_H_SIZE);
        buf = buf_acquire(length + INT_H_SIZE);
-       if (!buf) {
-               warn("Link changeover error, "
-                    "unable to send tunnel msg\n");
+       if (!buf)
                return;
-       }
        memcpy(buf->data, (unchar *)tunnel_hdr, INT_H_SIZE);
        memcpy(buf->data + INT_H_SIZE, (unchar *)msg, length);
        dbg("%c->%c:", l_ptr->b_ptr->net_plane, tunnel->b_ptr->net_plane);
        msg_dbg(buf_msg(buf), ">SEND>");
+       assert(tunnel);
        tipc_link_send_buf(tunnel, buf);
 }
 
@@ -2337,27 +2235,23 @@ void tipc_link_changeover(struct link *l_ptr)
        u32 msgcount = l_ptr->out_queue_size;
        struct sk_buff *crs = l_ptr->first_out;
        struct link *tunnel = l_ptr->owner->active_links[0];
+       int split_bundles = tipc_node_has_redundant_links(l_ptr->owner);
        struct tipc_msg tunnel_hdr;
-       int split_bundles;
 
        if (!tunnel)
                return;
 
-       if (!l_ptr->owner->permit_changeover) {
-               warn("Link changeover error, "
-                    "peer did not permit changeover\n");
+       if (!l_ptr->owner->permit_changeover)
                return;
-       }
 
        msg_init(&tunnel_hdr, CHANGEOVER_PROTOCOL,
                 ORIGINAL_MSG, TIPC_OK, INT_H_SIZE, l_ptr->addr);
        msg_set_bearer_id(&tunnel_hdr, l_ptr->peer_bearer_id);
        msg_set_msgcnt(&tunnel_hdr, msgcount);
-       dbg("Link changeover requires %u tunnel messages\n", msgcount);
-
        if (!l_ptr->first_out) {
                struct sk_buff *buf;
 
+               assert(!msgcount);
                buf = buf_acquire(INT_H_SIZE);
                if (buf) {
                        memcpy(buf->data, (unchar *)&tunnel_hdr, INT_H_SIZE);
@@ -2367,15 +2261,10 @@ void tipc_link_changeover(struct link *l_ptr)
                        msg_dbg(&tunnel_hdr, "EMPTY>SEND>");
                        tipc_link_send_buf(tunnel, buf);
                } else {
-                       warn("Link changeover error, "
-                            "unable to send changeover msg\n");
+                       warn("Memory squeeze; link changeover failed\n");
                }
                return;
        }
-
-       split_bundles = (l_ptr->owner->active_links[0] != 
-                        l_ptr->owner->active_links[1]);
-
        while (crs) {
                struct tipc_msg *msg = buf_msg(crs);
 
@@ -2421,8 +2310,7 @@ void tipc_link_send_duplicate(struct link *l_ptr, struct link *tunnel)
                msg_set_size(&tunnel_hdr, length + INT_H_SIZE);
                outbuf = buf_acquire(length + INT_H_SIZE);
                if (outbuf == NULL) {
-                       warn("Link changeover error, "
-                            "unable to send duplicate msg\n");
+                       warn("Memory squeeze; buffer duplication failed\n");
                        return;
                }
                memcpy(outbuf->data, (unchar *)&tunnel_hdr, INT_H_SIZE);
@@ -2476,15 +2364,11 @@ static int link_recv_changeover_msg(struct link **l_ptr,
        u32 msg_count = msg_msgcnt(tunnel_msg);
 
        dest_link = (*l_ptr)->owner->links[msg_bearer_id(tunnel_msg)];
+       assert(dest_link != *l_ptr);
        if (!dest_link) {
                msg_dbg(tunnel_msg, "NOLINK/<REC<");
                goto exit;
        }
-       if (dest_link == *l_ptr) {
-               err("Unexpected changeover message on link <%s>\n", 
-                   (*l_ptr)->name);
-               goto exit;
-       }
        dbg("%c<-%c:", dest_link->b_ptr->net_plane,
            (*l_ptr)->b_ptr->net_plane);
        *l_ptr = dest_link;
@@ -2497,7 +2381,7 @@ static int link_recv_changeover_msg(struct link **l_ptr,
                }
                *buf = buf_extract(tunnel_buf,INT_H_SIZE);
                if (*buf == NULL) {
-                       warn("Link changeover error, duplicate msg dropped\n");
+                       warn("Memory squeeze; failed to extract msg\n");
                        goto exit;
                }
                msg_dbg(tunnel_msg, "TNL<REC<");
@@ -2509,17 +2393,13 @@ static int link_recv_changeover_msg(struct link **l_ptr,
 
        if (tipc_link_is_up(dest_link)) {
                msg_dbg(tunnel_msg, "UP/FIRST/<REC<");
-               info("Resetting link <%s>, changeover initiated by peer\n",
-                    dest_link->name);
                tipc_link_reset(dest_link);
                dest_link->exp_msg_count = msg_count;
-               dbg("Expecting %u tunnelled messages\n", msg_count);
                if (!msg_count)
                        goto exit;
        } else if (dest_link->exp_msg_count == START_CHANGEOVER) {
                msg_dbg(tunnel_msg, "BLK/FIRST/<REC<");
                dest_link->exp_msg_count = msg_count;
-               dbg("Expecting %u tunnelled messages\n", msg_count);
                if (!msg_count)
                        goto exit;
        }
@@ -2527,8 +2407,6 @@ static int link_recv_changeover_msg(struct link **l_ptr,
        /* Receive original message */
 
        if (dest_link->exp_msg_count == 0) {
-               warn("Link switchover error, "
-                    "got too many tunnelled messages\n");
                msg_dbg(tunnel_msg, "OVERDUE/DROP/<REC<");
                dbg_print_link(dest_link, "LINK:");
                goto exit;
@@ -2544,11 +2422,11 @@ static int link_recv_changeover_msg(struct link **l_ptr,
                        buf_discard(tunnel_buf);
                        return 1;
                } else {
-                       warn("Link changeover error, original msg dropped\n");
+                       warn("Memory squeeze; dropped incoming msg\n");
                }
        }
 exit:
-       *buf = NULL;
+       *buf = 0;
        buf_discard(tunnel_buf);
        return 0;
 }
@@ -2566,8 +2444,13 @@ void tipc_link_recv_bundle(struct sk_buff *buf)
        while (msgcount--) {
                obuf = buf_extract(buf, pos);
                if (obuf == NULL) {
-                       warn("Link unable to unbundle message(s)\n");
-                       break;
+                       char addr_string[16];
+
+                       warn("Buffer allocation failure;\n");
+                       warn("  incoming message(s) from %s lost\n",
+                            addr_string_fill(addr_string, 
+                                             msg_orignode(buf_msg(buf))));
+                       return;
                };
                pos += align(msg_size(buf_msg(obuf)));
                msg_dbg(buf_msg(obuf), "     /");
@@ -2625,7 +2508,7 @@ int tipc_link_send_long_buf(struct link *l_ptr, struct sk_buff *buf)
                }
                fragm = buf_acquire(fragm_sz + INT_H_SIZE);
                if (fragm == NULL) {
-                       warn("Link unable to fragment message\n");
+                       warn("Memory squeeze; failed to fragment msg\n");
                        dsz = -ENOMEM;
                        goto exit;
                }
@@ -2656,37 +2539,42 @@ exit:
  * pending message. This makes dynamic memory allocation unecessary.
  */
 
-static void set_long_msg_seqno(struct sk_buff *buf, u32 seqno)
+static inline u32 get_long_msg_seqno(struct sk_buff *buf)
+{
+       return msg_seqno(buf_msg(buf));
+}
+
+static inline void set_long_msg_seqno(struct sk_buff *buf, u32 seqno)
 {
        msg_set_seqno(buf_msg(buf), seqno);
 }
 
-static u32 get_fragm_size(struct sk_buff *buf)
+static inline u32 get_fragm_size(struct sk_buff *buf)
 {
        return msg_ack(buf_msg(buf));
 }
 
-static void set_fragm_size(struct sk_buff *buf, u32 sz)
+static inline void set_fragm_size(struct sk_buff *buf, u32 sz)
 {
        msg_set_ack(buf_msg(buf), sz);
 }
 
-static u32 get_expected_frags(struct sk_buff *buf)
+static inline u32 get_expected_frags(struct sk_buff *buf)
 {
        return msg_bcast_ack(buf_msg(buf));
 }
 
-static void set_expected_frags(struct sk_buff *buf, u32 exp)
+static inline void set_expected_frags(struct sk_buff *buf, u32 exp)
 {
        msg_set_bcast_ack(buf_msg(buf), exp);
 }
 
-static u32 get_timer_cnt(struct sk_buff *buf)
+static inline u32 get_timer_cnt(struct sk_buff *buf)
 {
        return msg_reroute_cnt(buf_msg(buf));
 }
 
-static void incr_timer_cnt(struct sk_buff *buf)
+static inline void incr_timer_cnt(struct sk_buff *buf)
 {
        msg_incr_reroute_cnt(buf_msg(buf));
 }
@@ -2698,13 +2586,13 @@ static void incr_timer_cnt(struct sk_buff *buf)
 int tipc_link_recv_fragment(struct sk_buff **pending, struct sk_buff **fb, 
                            struct tipc_msg **m)
 {
-       struct sk_buff *prev = NULL;
+       struct sk_buff *prev = 0;
        struct sk_buff *fbuf = *fb;
        struct tipc_msg *fragm = buf_msg(fbuf);
        struct sk_buff *pbuf = *pending;
        u32 long_msg_seq_no = msg_long_msgno(fragm);
 
-       *fb = NULL;
+       *fb = 0;
        msg_dbg(fragm,"FRG<REC<");
 
        /* Is there an incomplete message waiting for this fragment? */
@@ -2740,7 +2628,7 @@ int tipc_link_recv_fragment(struct sk_buff **pending, struct sk_buff **fb,
                        set_fragm_size(pbuf,fragm_sz); 
                        set_expected_frags(pbuf,exp_fragm_cnt - 1); 
                } else {
-                       warn("Link unable to reassemble fragmented message\n");
+                       warn("Memory squeeze; got no defragmenting buffer\n");
                }
                buf_discard(fbuf);
                return 0;
@@ -2782,8 +2670,8 @@ int tipc_link_recv_fragment(struct sk_buff **pending, struct sk_buff **fb,
 
 static void link_check_defragm_bufs(struct link *l_ptr)
 {
-       struct sk_buff *prev = NULL;
-       struct sk_buff *next = NULL;
+       struct sk_buff *prev = 0;
+       struct sk_buff *next = 0;
        struct sk_buff *buf = l_ptr->defragm_buf;
 
        if (!buf)
@@ -2862,19 +2750,19 @@ static struct link *link_find_link(const char *name, struct node **node)
        struct link *l_ptr; 
 
        if (!link_name_validate(name, &link_name_parts))
-               return NULL;
+               return 0;
 
        b_ptr = tipc_bearer_find_interface(link_name_parts.if_local);
        if (!b_ptr)
-               return NULL;
+               return 0;
 
        *node = tipc_node_find(link_name_parts.addr_peer); 
        if (!*node)
-               return NULL;
+               return 0;
 
        l_ptr = (*node)->links[b_ptr->identity];
        if (!l_ptr || strcmp(l_ptr->name, name))
-               return NULL;
+               return 0;
 
        return l_ptr;
 }