tipc: remove unreferenced functions

We can now remove a number of functions which have become obsolete
and unreferenced through this commit series. There are no functional
changes in this commit.

Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Reviewed-by: Erik Hugne <erik.hugne@ericsson.com>
Reviewed-by: Ying Xue <ying.xue@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 0 insertions, 247 deletions

diff --git a/net/tipc/link.c b/net/tipc/link.c
index d1255ba51216..28730ddf4b78 100644
--- a/net/tipc/link.c
+++ b/net/tipc/link.c
@@ -85,7 +85,6 @@ static void link_set_supervision_props(struct tipc_link *l_ptr, u32 tolerance);
 static void link_state_event(struct tipc_link *l_ptr, u32 event);
 static void link_reset_statistics(struct tipc_link *l_ptr);
 static void link_print(struct tipc_link *l_ptr, const char *str);
-static int tipc_link_frag_xmit(struct tipc_link *l_ptr, struct sk_buff *buf);
 static void tipc_link_sync_xmit(struct tipc_link *l);
 static void tipc_link_sync_rcv(struct tipc_node *n, struct sk_buff *buf);
 static int tipc_link_input(struct tipc_link *l, struct sk_buff *buf);
@@ -679,180 +678,6 @@ static void link_state_event(struct tipc_link *l_ptr, unsigned int event)
         }
 }
 
-/*
- * link_bundle_buf(): Append contents of a buffer to
- * the tail of an existing one.
- */
-static int link_bundle_buf(struct tipc_link *l_ptr, struct sk_buff *bundler,
-                           struct sk_buff *buf)
-{
-        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;
-
-        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 (l_ptr->max_pkt < (to_pos + size))
-                return 0;
-
-        skb_put(bundler, pad + size);
-        skb_copy_to_linear_data_offset(bundler, to_pos, buf->data, size);
-        msg_set_size(bundler_msg, to_pos + size);
-        msg_set_msgcnt(bundler_msg, msg_msgcnt(bundler_msg) + 1);
-        kfree_skb(buf);
-        l_ptr->stats.sent_bundled++;
-        return 1;
-}
-
-static void link_add_to_outqueue(struct tipc_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++);
-
-        msg_set_word(msg, 2, ((ack << 16) | seqno));
-        msg_set_bcast_ack(msg, l_ptr->owner->bclink.last_in);
-        buf->next = NULL;
-        if (l_ptr->first_out) {
-                l_ptr->last_out->next = buf;
-                l_ptr->last_out = buf;
-        } else
-                l_ptr->first_out = l_ptr->last_out = buf;
-
-        l_ptr->out_queue_size++;
-        if (l_ptr->out_queue_size > l_ptr->stats.max_queue_sz)
-                l_ptr->stats.max_queue_sz = l_ptr->out_queue_size;
-}
-
-static void link_add_chain_to_outqueue(struct tipc_link *l_ptr,
-                                       struct sk_buff *buf_chain,
-                                       u32 long_msgno)
-{
-        struct sk_buff *buf;
-        struct tipc_msg *msg;
-
-        if (!l_ptr->next_out)
-                l_ptr->next_out = buf_chain;
-        while (buf_chain) {
-                buf = buf_chain;
-                buf_chain = buf_chain->next;
-
-                msg = buf_msg(buf);
-                msg_set_long_msgno(msg, long_msgno);
-                link_add_to_outqueue(l_ptr, buf, msg);
-        }
-}
-
-/*
- * tipc_link_xmit() is the 'full path' for messages, called from
- * inside TIPC when the 'fast path' in tipc_send_xmit
- * has failed, and from link_send()
- */
-int __tipc_link_xmit(struct tipc_link *l_ptr, struct sk_buff *buf)
-{
-        struct tipc_msg *msg = buf_msg(buf);
-        u32 size = msg_size(msg);
-        u32 dsz = msg_data_sz(msg);
-        u32 queue_size = l_ptr->out_queue_size;
-        u32 imp = tipc_msg_tot_importance(msg);
-        u32 queue_limit = l_ptr->queue_limit[imp];
-        u32 max_packet = l_ptr->max_pkt;
-
-        /* Match msg importance against queue limits: */
-        if (unlikely(queue_size >= queue_limit)) {
-                if (imp <= TIPC_CRITICAL_IMPORTANCE) {
-                        link_schedule_port(l_ptr, msg_origport(msg), size);
-                        kfree_skb(buf);
-                        return -ELINKCONG;
-                }
-                kfree_skb(buf);
-                if (imp > CONN_MANAGER) {
-                        pr_warn("%s<%s>, send queue full", link_rst_msg,
-                                l_ptr->name);
-                        tipc_link_reset(l_ptr);
-                }
-                return dsz;
-        }
-
-        /* Fragmentation needed ? */
-        if (size > max_packet)
-                return tipc_link_frag_xmit(l_ptr, buf);
-
-        /* Packet can be queued or sent. */
-        if (likely(!link_congested(l_ptr))) {
-                link_add_to_outqueue(l_ptr, buf, msg);
-
-                tipc_bearer_send(l_ptr->bearer_id, buf, &l_ptr->media_addr);
-                l_ptr->unacked_window = 0;
-                return dsz;
-        }
-        /* Congestion: can message be bundled ? */
-        if ((msg_user(msg) != CHANGEOVER_PROTOCOL) &&
-            (msg_user(msg) != MSG_FRAGMENTER)) {
-
-                /* Try adding message to an existing bundle */
-                if (l_ptr->next_out &&
-                    link_bundle_buf(l_ptr, l_ptr->last_out, buf))
-                        return dsz;
-
-                /* Try creating a new bundle */
-                if (size <= max_packet * 2 / 3) {
-                        struct sk_buff *bundler = tipc_buf_acquire(max_packet);
-                        struct tipc_msg bundler_hdr;
-
-                        if (bundler) {
-                                tipc_msg_init(&bundler_hdr, MSG_BUNDLER, OPEN_MSG,
-                                         INT_H_SIZE, l_ptr->addr);
-                                skb_copy_to_linear_data(bundler, &bundler_hdr,
-                                                        INT_H_SIZE);
-                                skb_trim(bundler, INT_H_SIZE);
-                                link_bundle_buf(l_ptr, bundler, buf);
-                                buf = bundler;
-                                msg = buf_msg(buf);
-                                l_ptr->stats.sent_bundles++;
-                        }
-                }
-        }
-        if (!l_ptr->next_out)
-                l_ptr->next_out = buf;
-        link_add_to_outqueue(l_ptr, buf, msg);
-        return dsz;
-}
-
-/*
- * tipc_link_xmit(): same as __tipc_link_xmit(), but the link to use
- * has not been selected yet, and the the owner node is not locked
- * Called by TIPC internal users, e.g. the name distributor
- */
-int tipc_link_xmit(struct sk_buff *buf, u32 dest, u32 selector)
-{
-        struct tipc_link *l_ptr;
-        struct tipc_node *n_ptr;
-        int res = -ELINKCONG;
-
-        n_ptr = tipc_node_find(dest);
-        if (n_ptr) {
-                tipc_node_lock(n_ptr);
-                l_ptr = n_ptr->active_links[selector & 1];
-                if (l_ptr)
-                        res = __tipc_link_xmit(l_ptr, buf);
-                else
-                        kfree_skb(buf);
-                tipc_node_unlock(n_ptr);
-        } else {
-                kfree_skb(buf);
-        }
-        return res;
-}
-
 /* tipc_link_cong: determine return value and how to treat the
  * sent buffer during link congestion.
  * - For plain, errorless user data messages we keep the buffer and
@@ -2123,78 +1948,6 @@ void tipc_link_bundle_rcv(struct sk_buff *buf)
         kfree_skb(buf);
 }
 
-/*
- *  Fragmentation/defragmentation:
- */
-
-/*
- * tipc_link_frag_xmit: Entry for buffers needing fragmentation.
- * The buffer is complete, inclusive total message length.
- * Returns user data length.
- */
-static int tipc_link_frag_xmit(struct tipc_link *l_ptr, struct sk_buff *buf)
-{
-        struct sk_buff *buf_chain = NULL;
-        struct sk_buff *buf_chain_tail = (struct sk_buff *)&buf_chain;
-        struct tipc_msg *inmsg = buf_msg(buf);
-        struct tipc_msg fragm_hdr;
-        u32 insize = msg_size(inmsg);
-        u32 dsz = msg_data_sz(inmsg);
-        unchar *crs = buf->data;
-        u32 rest = insize;
-        u32 pack_sz = l_ptr->max_pkt;
-        u32 fragm_sz = pack_sz - INT_H_SIZE;
-        u32 fragm_no = 0;
-        u32 destaddr;
-
-        if (msg_short(inmsg))
-                destaddr = l_ptr->addr;
-        else
-                destaddr = msg_destnode(inmsg);
-
-        /* Prepare reusable fragment header: */
-        tipc_msg_init(&fragm_hdr, MSG_FRAGMENTER, FIRST_FRAGMENT,
-                 INT_H_SIZE, destaddr);
-
-        /* Chop up message: */
-        while (rest > 0) {
-                struct sk_buff *fragm;
-
-                if (rest <= fragm_sz) {
-                        fragm_sz = rest;
-                        msg_set_type(&fragm_hdr, LAST_FRAGMENT);
-                }
-                fragm = tipc_buf_acquire(fragm_sz + INT_H_SIZE);
-                if (fragm == NULL) {
-                        kfree_skb(buf);
-                        kfree_skb_list(buf_chain);
-                        return -ENOMEM;
-                }
-                msg_set_size(&fragm_hdr, fragm_sz + INT_H_SIZE);
-                fragm_no++;
-                msg_set_fragm_no(&fragm_hdr, fragm_no);
-                skb_copy_to_linear_data(fragm, &fragm_hdr, INT_H_SIZE);
-                skb_copy_to_linear_data_offset(fragm, INT_H_SIZE, crs,
-                                               fragm_sz);
-                buf_chain_tail->next = fragm;
-                buf_chain_tail = fragm;
-
-                rest -= fragm_sz;
-                crs += fragm_sz;
-                msg_set_type(&fragm_hdr, FRAGMENT);
-        }
-        kfree_skb(buf);
-
-        /* Append chain of fragments to send queue & send them */
-        l_ptr->long_msg_seq_no++;
-        link_add_chain_to_outqueue(l_ptr, buf_chain, l_ptr->long_msg_seq_no);
-        l_ptr->stats.sent_fragments += fragm_no;
-        l_ptr->stats.sent_fragmented++;
-        tipc_link_push_queue(l_ptr);
-
-        return dsz;
-}
-
 static void link_set_supervision_props(struct tipc_link *l_ptr, u32 tolerance)
 {
         if ((tolerance < TIPC_MIN_LINK_TOL) || (tolerance > TIPC_MAX_LINK_TOL))