Merge branches 'core', 'cxgb4', 'ipath', 'iser', 'lockdep', 'mlx4', 'nes', 'ocrdma...
[linux-3.10.git] / include / rdma / ib_verbs.h
index c3cca5a..07996af 100644 (file)
@@ -605,7 +605,7 @@ enum ib_qp_type {
        IB_QPT_UD,
        IB_QPT_RAW_IPV6,
        IB_QPT_RAW_ETHERTYPE,
-       /* Save 8 for RAW_PACKET */
+       IB_QPT_RAW_PACKET = 8,
        IB_QPT_XRC_INI = 9,
        IB_QPT_XRC_TGT,
        IB_QPT_MAX
@@ -964,7 +964,7 @@ struct ib_qp {
        struct ib_srq          *srq;
        struct ib_xrcd         *xrcd; /* XRC TGT QPs only */
        struct list_head        xrcd_list;
-       atomic_t                usecnt; /* count times opened */
+       atomic_t                usecnt; /* count times opened, mcast attaches */
        struct list_head        open_list;
        struct ib_qp           *real_qp;
        struct ib_uobject      *uobject;