[openib-general] Re: [PATCH] collapse MAD function calls

[Hal Rosenstock]

On Mon, 2004-11-15 at 15:04, Sean Hefty wrote:
> On Mon, 15 Nov 2004 14:50:06 -0500
> Hal Rosenstock <halr at voltaire.com> wrote:
> 
> > On Mon, 2004-11-15 at 13:29, Sean Hefty wrote:
> > > On Fri, 12 Nov 2004 22:08:14 -0500
> > > Hal Rosenstock <halr at voltaire.com> wrote:
> > > > This patch looks like it includes the previous patch and due to this 2
> > > > large hunks are rejected. Can you regenerate this ?
> > > 
> > > Updated patch.
> 
> This should fix the merge/compilation issues.  

Thanks. Applied.

> Also, I re-examined the initial patch,
> and I don't see why it would have failed.  Oh well...

I can see some differences (other than line numbers):

28,30c28
< +                     attr->cur_qp_state = IB_QPS_SQE;
< +                     ret = ib_modify_qp(qp_info->qp, attr,
< +                                        IB_QP_STATE |
IB_QP_CUR_STATE);
---
> +                     ret = ib_modify_qp(qp_info->qp, attr,
IB_QP_STATE);
43,52c41,44
< @@ -1693,157 +1701,51 @@
<  }
<
<  /*
< - * Modify QP into Init state
< - */
< -static inline int ib_mad_change_qp_state_to_init(struct ib_qp *qp)
< -{
< -     int ret;
< -     struct ib_qp_attr *attr;
---
> @@ -1699,151 +1705,45 @@
>  {
>       int ret;
>       struct ib_qp_attr *attr;
86,87c78
< + * Start the port.
<   */
---
> - */
148,149c139
< +static int ib_mad_port_start(struct ib_mad_port_private *port_priv)
<  {
---
> -{
151,152c141
< +     int ret, i;
<       struct ib_qp_attr *attr;
---
> -     struct ib_qp_attr *attr;

-- Hal