← Back to branch summary

~ubuntu-branches/ubuntu/saucy/linux-ti-omap4/saucy-proposed

« back to all changes in this revision

Viewing changes to drivers/infiniband/hw/nes/nes_cm.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati, Stefan Bader, Upstream Kernel Changes
  • Date: 2012-08-15 17:17:43 UTC
  • Revision ID: package-import@ubuntu.com-20120815171743-h5wnuf51xe7pvdid
Tags: 3.5.0-207.13
[ Paolo Pisati ]

* Start new release

[ Stefan Bader ]

* (config) Enable getabis to use local package copies

[ Upstream Kernel Changes ]

* fixup: gargabe collect iva_seq[0|1] init
* [Config] enable all SND_OMAP_SOC_*s
* fixup: cm2xxx_3xxx.o is needed for omap2_cm_read|write_reg
* fixup: add some snd_soc_dai* helper functions
* fixup: s/snd_soc_dpcm_params/snd_soc_dpcm/g
* fixup: typo, no_host_mode and useless SDP4430 init
* fixup: enable again aess hwmod

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/infiniband/hw/nes/nes_cm.c
2884
2884
                        ibevent.device = nesqp->ibqp.device;
2885
2885
                        ibevent.event = nesqp->terminate_eventtype;
2886
2886
                        ibevent.element.qp = &nesqp->ibqp;
2887
 
                        nesqp->ibqp.event_handler(&ibevent, nesqp->ibqp.qp_context);
 
2887
                        if (nesqp->ibqp.event_handler)
 
2888
                                nesqp->ibqp.event_handler(&ibevent, nesqp->ibqp.qp_context);
2888
2889
                }
2889
2890
        }
2890
2891
 
3320
3321
 
3321
3322
        nesqp->private_data_len = conn_param->private_data_len;
3322
3323
        nesqp->nesqp_context->ird_ord_sizes |= cpu_to_le32((u32)conn_param->ord);
 
3324
        /* space for rdma0 read msg */
 
3325
        if (conn_param->ord == 0)
 
3326
                nesqp->nesqp_context->ird_ord_sizes |= cpu_to_le32(1);
 
3327
 
3323
3328
        nes_debug(NES_DBG_CM, "requested ord = 0x%08X.\n", (u32)conn_param->ord);
3324
3329
        nes_debug(NES_DBG_CM, "mpa private data len =%u\n",
3325
3330
                  conn_param->private_data_len);