Merge branch 'tipc-next'

Richard Alpe says:

====================
tipc: new compat layer for the legacy NL API

This is a compatibility / transcoding layer for the old netlink API.
It relies on the new netlink API to collect data or perform actions
(dumpit / doit).

The main benefit of this compat layer is that it removes a lot of
complex code from the tipc core as only the new API needs to be able
harness data or perform actions. I.e. the compat layer isn't concerned
with locking or how the internal data-structures look. As long as the
new API stays relatively intact the compat layer should be fine.

The main challenge in this compat layer is the randomness of the legacy
API. Some commands send binary data and some send ASCII data, some are
very picky in optimizing there buffer sizes and some just don't care.
Most legacy commands put there data in a single TLV (data container) but some
segment the data into multiple TLV's. This list of randomness goes on and on..
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 1 insertions, 44 deletions

diff --git a/net/tipc/bcast.c b/net/tipc/bcast.c
index 81b1fef1f5e0..3e41704832de 100644
--- a/net/tipc/bcast.c
+++ b/net/tipc/bcast.c
@@ -810,7 +810,7 @@ int tipc_nl_add_bc_link(struct net *net, struct tipc_nl_msg *msg)
 
         tipc_bclink_lock(net);
 
-        hdr = genlmsg_put(msg->skb, msg->portid, msg->seq, &tipc_genl_v2_family,
+        hdr = genlmsg_put(msg->skb, msg->portid, msg->seq, &tipc_genl_family,
                           NLM_F_MULTI, TIPC_NL_LINK_GET);
         if (!hdr)
                 return -EMSGSIZE;
@@ -860,49 +860,6 @@ msg_full:
         return -EMSGSIZE;
 }
 
-int tipc_bclink_stats(struct net *net, char *buf, const u32 buf_size)
-{
-        int ret;
-        struct tipc_stats *s;
-        struct tipc_net *tn = net_generic(net, tipc_net_id);
-        struct tipc_link *bcl = tn->bcl;
-
-        if (!bcl)
-                return 0;
-
-        tipc_bclink_lock(net);
-
-        s = &bcl->stats;
-
-        ret = tipc_snprintf(buf, buf_size, "Link <%s>\n"
-                            "  Window:%u packets\n",
-                            bcl->name, bcl->queue_limit[0]);
-        ret += tipc_snprintf(buf + ret, buf_size - ret,
-                             "  RX packets:%u fragments:%u/%u bundles:%u/%u\n",
-                             s->recv_info, s->recv_fragments,
-                             s->recv_fragmented, s->recv_bundles,
-                             s->recv_bundled);
-        ret += tipc_snprintf(buf + ret, buf_size - ret,
-                             "  TX packets:%u fragments:%u/%u bundles:%u/%u\n",
-                             s->sent_info, s->sent_fragments,
-                             s->sent_fragmented, s->sent_bundles,
-                             s->sent_bundled);
-        ret += tipc_snprintf(buf + ret, buf_size - ret,
-                             "  RX naks:%u defs:%u dups:%u\n",
-                             s->recv_nacks, s->deferred_recv, s->duplicates);
-        ret += tipc_snprintf(buf + ret, buf_size - ret,
-                             "  TX naks:%u acks:%u dups:%u\n",
-                             s->sent_nacks, s->sent_acks, s->retransmitted);
-        ret += tipc_snprintf(buf + ret, buf_size - ret,
-                             "  Congestion link:%u  Send queue max:%u avg:%u\n",
-                             s->link_congs, s->max_queue_sz,
-                             s->queue_sz_counts ?
-                             (s->accu_queue_sz / s->queue_sz_counts) : 0);
-
-        tipc_bclink_unlock(net);
-        return ret;
-}
-
 int tipc_bclink_reset_stats(struct net *net)
 {
         struct tipc_net *tn = net_generic(net, tipc_net_id);