Merge tag 'for-linus-unmerged' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma...

[platform/kernel/linux-rpi.git] / include / rdma / ib_verbs.h

diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h
index 4bd24c4..9fc8a82 100644 (file)
--- a/include/rdma/ib_verbs.h
+++ b/include/rdma/ib_verbs.h
@@ -1559,10 +1559,6 @@ struct ib_xrcd {
 
        struct mutex            tgt_qp_mutex;
        struct list_head        tgt_qp_list;
-       /*
-        * Implementation details of the RDMA core, don't use in drivers:
-        */
-       struct rdma_restrack_entry res;
 };
 
 struct ib_ah {
@@ -2248,8 +2244,8 @@ struct ib_device {
         * net device of device @device at port @port_num or NULL if such
         * a net device doesn't exist. The vendor driver should call dev_hold
         * on this net device. The HW vendor's device driver must guarantee
-        * that this function returns NULL before the net device reaches
-        * NETDEV_UNREGISTER_FINAL state.
+        * that this function returns NULL before the net device has finished
+        * NETDEV_UNREGISTER state.
         */
        struct net_device         *(*get_netdev)(struct ib_device *device,
                                                 u8 port_num);