OK, getting closer to finishing the merge... anyway, why is iw_cm_private.h in include/rdma where it is visible everywhere? As far as I can tell drivers/infiniband/core/iwcm.c is the only place it's included. So why not just put this stuff in drivers/infiniband/core/iwcm.h and do
#include "iwcm.h" Or the file is small enough that maybe it's simpler just to stuff this at the top of iwcm.c and kill the include entirely? - R. > --- /dev/null > +++ b/include/rdma/iw_cm_private.h > @@ -0,0 +1,63 @@ > +#ifndef IW_CM_PRIVATE_H > +#define IW_CM_PRIVATE_H > + > +#include <rdma/iw_cm.h> > + > +enum iw_cm_state { > + IW_CM_STATE_IDLE, /* unbound, inactive */ > + IW_CM_STATE_LISTEN, /* listen waiting for connect */ > + IW_CM_STATE_CONN_RECV, /* inbound waiting for user accept */ > + IW_CM_STATE_CONN_SENT, /* outbound waiting for peer accept */ > + IW_CM_STATE_ESTABLISHED, /* established */ > + IW_CM_STATE_CLOSING, /* disconnect */ > + IW_CM_STATE_DESTROYING /* object being deleted */ > +}; > + > +struct iwcm_id_private { > + struct iw_cm_id id; > + enum iw_cm_state state; > + unsigned long flags; > + struct ib_qp *qp; > + struct completion destroy_comp; > + wait_queue_head_t connect_wait; > + struct list_head work_list; > + spinlock_t lock; > + atomic_t refcount; > + struct list_head work_free_list; > +}; > +#define IWCM_F_CALLBACK_DESTROY 1 > +#define IWCM_F_CONNECT_WAIT 2 > + > +#endif /* IW_CM_PRIVATE_H */ - To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html