]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
rdma/cm: Export AF_IB statistics for-next
authorSean Hefty <sean.hefty@intel.com>
Tue, 22 Jan 2013 00:10:58 +0000 (16:10 -0800)
committerSean Hefty <sean.hefty@intel.com>
Tue, 28 May 2013 21:38:43 +0000 (14:38 -0700)
Report AF_IB source and destination addresses through
netlink interface.

Signed-off-by: Sean Hefty <sean.hefty@intel.com>
drivers/infiniband/core/cma.c

index 64456504a344d9fef979b10c1f55ffc0df83320c..d1e4d09e6d965f3d91953bee6f1d29a8565f18a3 100644 (file)
@@ -3586,33 +3586,16 @@ static int cma_get_id_stats(struct sk_buff *skb, struct netlink_callback *cb)
                        id_stats->bound_dev_if =
                                id->route.addr.dev_addr.bound_dev_if;
 
-                       if (cma_family(id_priv) == AF_INET) {
-                               if (ibnl_put_attr(skb, nlh,
-                                                 sizeof(struct sockaddr_in),
-                                                 cma_src_addr(id_priv),
-                                                 RDMA_NL_RDMA_CM_ATTR_SRC_ADDR)) {
-                                       goto out;
-                               }
-                               if (ibnl_put_attr(skb, nlh,
-                                                 sizeof(struct sockaddr_in),
-                                                 cma_dst_addr(id_priv),
-                                                 RDMA_NL_RDMA_CM_ATTR_DST_ADDR)) {
-                                       goto out;
-                               }
-                       } else if (cma_family(id_priv) == AF_INET6) {
-                               if (ibnl_put_attr(skb, nlh,
-                                                 sizeof(struct sockaddr_in6),
-                                                 cma_src_addr(id_priv),
-                                                 RDMA_NL_RDMA_CM_ATTR_SRC_ADDR)) {
-                                       goto out;
-                               }
-                               if (ibnl_put_attr(skb, nlh,
-                                                 sizeof(struct sockaddr_in6),
-                                                 cma_dst_addr(id_priv),
-                                                 RDMA_NL_RDMA_CM_ATTR_DST_ADDR)) {
-                                       goto out;
-                               }
-                       }
+                       if (ibnl_put_attr(skb, nlh,
+                                         rdma_addr_size(cma_src_addr(id_priv)),
+                                         cma_src_addr(id_priv),
+                                         RDMA_NL_RDMA_CM_ATTR_SRC_ADDR))
+                               goto out;
+                       if (ibnl_put_attr(skb, nlh,
+                                         rdma_addr_size(cma_src_addr(id_priv)),
+                                         cma_dst_addr(id_priv),
+                                         RDMA_NL_RDMA_CM_ATTR_DST_ADDR))
+                               goto out;
 
                        id_stats->pid           = id_priv->owner;
                        id_stats->port_space    = id->ps;